Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
cta
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Harbor Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dCache
cta
Commits
75f26233
Commit
75f26233
authored
5 years ago
by
Steven Murray
Browse files
Options
Downloads
Patches
Plain Diff
Upgraded PostgreSQL server to version 12
parent
2d8268ea
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+3
-3
3 additions, 3 deletions
.gitlab-ci.yml
tests/postgresqlUnitTests.sh
+5
-5
5 additions, 5 deletions
tests/postgresqlUnitTests.sh
with
8 additions
and
8 deletions
.gitlab-ci.yml
+
3
−
3
View file @
75f26233
...
...
@@ -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-postgresql
96
-postgresql-server
-
yum -y install rh-postgresql
12
-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-postgresql
96
/root/usr/lib64
-
POSTGRES_BIN=/opt/rh/rh-postgresql
96
/root/usr/bin
-
export LD_LIBRARY_PATH=/opt/rh/rh-postgresql
12
/root/usr/lib64
-
POSTGRES_BIN=/opt/rh/rh-postgresql
12
/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
...
...
This diff is collapsed.
Click to expand it.
tests/postgresqlUnitTests.sh
+
5
−
5
View file @
75f26233
...
...
@@ -2,8 +2,8 @@
# Utility script to run postgresql tests like in CI.
if
!
rpm
-q
--quiet
rh-postgresql
96
-postgresql-server
;
then
echo
"Please install the package rh-postgresql
96
-postgresql-server to run this script."
if
!
rpm
-q
--quiet
rh-postgresql
12
-postgresql-server
;
then
echo
"Please install the package rh-postgresql
12
-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-postgresql
96
/root/usr/lib64
POSTGRES_BIN
=
/opt/rh/rh-postgresql
96
/root/usr/bin
export
LD_LIBRARY_PATH
=
/opt/rh/rh-postgresql
12
/root/usr/lib64
POSTGRES_BIN
=
/opt/rh/rh-postgresql
12
/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
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment