From ae54ca8ae749ea45eff2efdeead93dca83f08de7 Mon Sep 17 00:00:00 2001 From: Christian Beikov Date: Wed, 14 Dec 2022 20:39:34 +0100 Subject: [PATCH] HHH-15863 Update PostgreSQL testing to version 15 --- Jenkinsfile | 2 +- docker_db.sh | 8 +++++++- nightly.Jenkinsfile | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6d7beadff1..446b2964ef 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -167,7 +167,7 @@ stage('Build') { case "postgresql": // use the postgis image to enable the PGSQL GIS (spatial) extension docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') { - docker.image('postgis/postgis:14-3.3').pull() + docker.image('postgis/postgis:15-3.3').pull() } sh "./docker_db.sh postgresql" state[buildEnv.tag]['containerName'] = "postgres" diff --git a/docker_db.sh b/docker_db.sh index 27c23cbf98..7374ef5a67 100755 --- a/docker_db.sh +++ b/docker_db.sh @@ -118,7 +118,7 @@ mariadb_10_9() { } postgresql() { - postgresql_14 + postgresql_15 } postgresql_9_5() { @@ -141,6 +141,11 @@ postgresql_14() { $CONTAINER_CLI run --name postgres -e POSTGRES_USER=hibernate_orm_test -e POSTGRES_PASSWORD=hibernate_orm_test -e POSTGRES_DB=hibernate_orm_test -p5432:5432 -d docker.io/postgis/postgis:14-3.3 } +postgresql_15() { + $CONTAINER_CLI rm -f postgres || true + $CONTAINER_CLI run --name postgres -e POSTGRES_USER=hibernate_orm_test -e POSTGRES_PASSWORD=hibernate_orm_test -e POSTGRES_DB=hibernate_orm_test -p5432:5432 -d docker.io/postgis/postgis:15-3.3 +} + edb() { edb_14 } @@ -712,6 +717,7 @@ if [ -z ${1} ]; then echo -e "\toracle_18" echo -e "\toracle_11" echo -e "\tpostgresql" + echo -e "\tpostgresql_15" echo -e "\tpostgresql_14" echo -e "\tpostgresql_13" echo -e "\tpostgresql_10" diff --git a/nightly.Jenkinsfile b/nightly.Jenkinsfile index f79dd103dd..07fb711616 100644 --- a/nightly.Jenkinsfile +++ b/nightly.Jenkinsfile @@ -151,7 +151,7 @@ stage('Build') { case "postgresql": // use the postgis image to enable the PGSQL GIS (spatial) extension docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') { - docker.image('postgis/postgis:14-3.3').pull() + docker.image('postgis/postgis:15-3.3').pull() } sh "./docker_db.sh postgresql" state[buildEnv.tag]['containerName'] = "postgres"