diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff9e6d0e73..6739d56ca4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -223,8 +223,8 @@ jobs: - name: "Clean Maven cache" run: bash ./scripts/ci/cleanup_cache.sh - repository_postgresql_13_7_tests: - name: "Repository - PostgreSQL 13.7 tests" + repository_postgresql_13_12_tests: + name: "Repository - PostgreSQL 13.12 tests" runs-on: ubuntu-latest needs: [prepare] if: > @@ -239,17 +239,42 @@ jobs: - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0 - name: "Init" run: bash ./scripts/ci/init.sh - - name: "Run PostgreSQL 13.7 database" + - name: "Run PostgreSQL 13.12 database" run: docker-compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d env: - POSTGRES_VERSION: 13.7 + POSTGRES_VERSION: 13.12 - name: "Run tests" run: mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco - name: "Clean Maven cache" run: bash ./scripts/ci/cleanup_cache.sh - repository_postgresql_14_4_tests: - name: "Repository - PostgreSQL 14.4 tests" + repository_postgresql_14_9_tests: + name: "Repository - PostgreSQL 14.9 tests" + runs-on: ubuntu-latest + needs: [prepare] + if: > + (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/')) && github.event_name != 'pull_request' && + !contains(github.event.head_commit.message, '[skip db]')) || + contains(github.event.head_commit.message, '[db]')) && + !contains(github.event.head_commit.message, '[skip tests]') && + !contains(github.event.head_commit.message, '[force') + steps: + - uses: actions/checkout@v3 + - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0 + - name: "Init" + run: bash ./scripts/ci/init.sh + - name: "Run PostgreSQL 14.9 database" + run: docker-compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d + env: + POSTGRES_VERSION: 14.9 + - name: "Run tests" + run: mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco + - name: "Clean Maven cache" + run: bash ./scripts/ci/cleanup_cache.sh + + repository_postgresql_15_4_tests: + name: "Repository - PostgreSQL 15.4 tests" runs-on: ubuntu-latest needs: [prepare] if: > @@ -264,10 +289,10 @@ jobs: - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0 - name: "Init" run: bash ./scripts/ci/init.sh - - name: "Run PostgreSQL 14.4 database" + - name: "Run PostgreSQL 15.4 database" run: docker-compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d env: - POSTGRES_VERSION: 14.4 + POSTGRES_VERSION: 15.4 - name: "Run tests" run: mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco - name: "Clean Maven cache" @@ -444,7 +469,7 @@ jobs: - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0 - name: "Init" run: bash ./scripts/ci/init.sh - - name: "Run Postgres 14.4 database" + - name: "Run Postgres 15.4 database" run: docker-compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile postgres up -d - name: "Run tests" run: mvn -B test -pl :alfresco-share-services -am -Dtest=ShareServicesTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco diff --git a/amps/ags/rm-community/rm-community-repo/.env b/amps/ags/rm-community/rm-community-repo/.env index 9bb919294b..a7aec5de9c 100644 --- a/amps/ags/rm-community/rm-community-repo/.env +++ b/amps/ags/rm-community/rm-community-repo/.env @@ -1,3 +1,3 @@ SOLR6_TAG=2.0.8.1 -POSTGRES_TAG=14.4 +POSTGRES_TAG=15.4 ACTIVEMQ_TAG=5.18.2-jre17-rockylinux8 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 7bbf6fb418..e9f93e8226 100644 --- a/amps/ags/rm-community/rm-community-repo/pom.xml +++ b/amps/ags/rm-community/rm-community-repo/pom.xml @@ -416,9 +416,7 @@ - - postgres:9.4.12 - + postgres:15.4 ${postgresql.tests.port}:${postgresql.port} diff --git a/packaging/tests/environment/.env b/packaging/tests/environment/.env index 9bb919294b..a7aec5de9c 100644 --- a/packaging/tests/environment/.env +++ b/packaging/tests/environment/.env @@ -1,3 +1,3 @@ SOLR6_TAG=2.0.8.1 -POSTGRES_TAG=14.4 +POSTGRES_TAG=15.4 ACTIVEMQ_TAG=5.18.2-jre17-rockylinux8 diff --git a/scripts/ci/docker-compose/docker-compose.yaml b/scripts/ci/docker-compose/docker-compose.yaml index 2f44436764..e1b90965b3 100644 --- a/scripts/ci/docker-compose/docker-compose.yaml +++ b/scripts/ci/docker-compose/docker-compose.yaml @@ -9,7 +9,7 @@ services: ports: - "8090:8090" postgres: - image: postgres:14.4 + image: postgres:15.4 profiles: ["default", "with-transform-core-aio", "postgres", "with-mtls-transform-core-aio"] environment: - POSTGRES_PASSWORD=alfresco