From 75f2623351f836c609f9cadcae8988af2e311ade Mon Sep 17 00:00:00 2001
From: Steven Murray <Steven.Murray@cern.ch>
Date: Mon, 10 Feb 2020 16:07:26 +0100
Subject: [PATCH] Upgraded PostgreSQL server to version 12
---
.gitlab-ci.yml | 6 +++---
tests/postgresqlUnitTests.sh | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f1c2f11b0e..11c39ecae7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -137,7 +137,7 @@ dbunittests_postgresql:
- createrepo ${CTAREPODIR}; echo -e "[cta-artifacts]\nname=CTA artifacts\nbaseurl=file://${CTAREPODIR}\ngpgcheck=0\nenabled=1\npriority=2" > /etc/yum.repos.d/cta-artifacts.repo
- yum -y --nogpgcheck install cta-systemtests cta-debuginfo sqlite-debuginfo --enablerepo=debug
- yum -y install cta-catalogueutils
- - yum -y install rh-postgresql96-postgresql-server
+ - yum -y install rh-postgresql12-postgresql-server
- POSTGRESQL_DATA_DIR=/usr/local/cta_test_pgsql_data
- POSTGRESQL_LOG_DIR=/var/log/postgres
- echo POSTGRESQL_DATA_DIR=${POSTGRESQL_DATA_DIR}
@@ -146,8 +146,8 @@ dbunittests_postgresql:
- chown -R postgres:postgres ${POSTGRESQL_DATA_DIR}
- mkdir -p ${POSTGRESQL_LOG_DIR}
- chown -R postgres:postgres ${POSTGRESQL_LOG_DIR}
- - export LD_LIBRARY_PATH=/opt/rh/rh-postgresql96/root/usr/lib64
- - POSTGRES_BIN=/opt/rh/rh-postgresql96/root/usr/bin
+ - export LD_LIBRARY_PATH=/opt/rh/rh-postgresql12/root/usr/lib64
+ - POSTGRES_BIN=/opt/rh/rh-postgresql12/root/usr/bin
- echo POSTGRES_BIN=${POSTGRES_BIN}
- runuser -u postgres -- ${POSTGRES_BIN}/initdb -D ${POSTGRESQL_DATA_DIR}
- runuser -u postgres -- ${POSTGRES_BIN}/pg_ctl start -w -t 10 -D ${POSTGRESQL_DATA_DIR} -l ${POSTGRESQL_LOG_DIR}/cta_test_postgres.log
diff --git a/tests/postgresqlUnitTests.sh b/tests/postgresqlUnitTests.sh
index 34a86c07af..a32fb9bfc0 100755
--- a/tests/postgresqlUnitTests.sh
+++ b/tests/postgresqlUnitTests.sh
@@ -2,8 +2,8 @@
# Utility script to run postgresql tests like in CI.
-if ! rpm -q --quiet rh-postgresql96-postgresql-server; then
- echo "Please install the package rh-postgresql96-postgresql-server to run this script."
+if ! rpm -q --quiet rh-postgresql12-postgresql-server; then
+ echo "Please install the package rh-postgresql12-postgresql-server to run this script."
exit 1
fi
@@ -25,8 +25,8 @@ mkdir -p ${POSTGRESQL_DATA_DIR}
chown -R postgres:postgres ${POSTGRESQL_DATA_DIR}
mkdir -p ${POSTGRESQL_LOG_DIR}
chown -R postgres:postgres ${POSTGRESQL_LOG_DIR}
-export LD_LIBRARY_PATH=/opt/rh/rh-postgresql96/root/usr/lib64
-POSTGRES_BIN=/opt/rh/rh-postgresql96/root/usr/bin
+export LD_LIBRARY_PATH=/opt/rh/rh-postgresql12/root/usr/lib64
+POSTGRES_BIN=/opt/rh/rh-postgresql12/root/usr/bin
echo POSTGRES_BIN=${POSTGRES_BIN}
(cd / ;
runuser -u postgres -- ${POSTGRES_BIN}/initdb -D ${POSTGRESQL_DATA_DIR}
@@ -40,4 +40,4 @@ echo 'postgresql:postgresql://cta@localhost/cta' > ${CTA_CATALOGUE_CONF}
./catalogue/cta-catalogue-schema-create ${CTA_CATALOGUE_CONF}
./tests/cta-rdbmsUnitTests ${CTA_CATALOGUE_CONF}
(cd / ; runuser -u postgres -- ${POSTGRES_BIN}/pg_ctl stop -D ${POSTGRESQL_DATA_DIR})
-rm -rf ${POSTGRESQL_DATA_DIR}
\ No newline at end of file
+rm -rf ${POSTGRESQL_DATA_DIR}
--
GitLab