From c7b33cea82a82b527a4b97bf4362a5339a80fba9 Mon Sep 17 00:00:00 2001 From: KushnirykOleh Date: Thu, 15 Aug 2024 16:24:42 +0300 Subject: [PATCH] added EDB-16 --- .github/workflows/advanced.yml | 4 ++-- .github/workflows/main.yml | 6 ++++-- src/test/resources/automation-runner.sh | 6 ++++++ src/test/resources/docker/docker-compose.yml | 22 ++++++++++++++++++++ src/test/resources/harness-config.yml | 14 +++++++++++++ 5 files changed, 48 insertions(+), 4 deletions(-) diff --git a/.github/workflows/advanced.yml b/.github/workflows/advanced.yml index 7d5ba788f..2831543bd 100644 --- a/.github/workflows/advanced.yml +++ b/.github/workflows/advanced.yml @@ -27,7 +27,7 @@ on: required: true default: "[\"mysql-5.6\",\"mysql-5.7\",\"mysql-8\",\"postgres-12\",\"postgres-13\",\"postgres-14\",\"postgres-15\",\"postgres-16\",\"mariadb-10.2\",\"mariadb-10.3\",\"mariadb-10.4\",\"mariadb-10.5\",\"mariadb-10.6\", \"mariadb-10.7\",\"mssql-2017\",\"mssql-2019\",\"mssql-2022\",\"crdb-23.1\",\"crdb-23.2\",\"crdb-24.1\",\"percona-xtradb-cluster-5.7\",\"percona-xtradb-cluster-8.0\", - \"edb-edb-12\",\"edb-edb-13\",\"edb-edb-14\",\"edb-edb-15\",\"db2-luw\",\"H2Database-2.2\",\"sqlite\",\"derby\", + \"edb-edb-12\",\"edb-edb-13\",\"edb-edb-14\",\"edb-edb-15\",\"edb-edb-16\",\"db2-luw\",\"H2Database-2.2\",\"sqlite\",\"derby\", \"firebird-3\",\"firebird-4\",\"hsqldb-2.4\",\"hsqldb-2.5\",\"diff\"]" jobs: @@ -52,7 +52,7 @@ jobs: databases: ${{ github.event.inputs.databases || '["mysql-5.6","mysql-5.7","mysql-8", "postgres-12","postgres-13","postgres-14","postgres-15","postgres-16","mariadb-10.2","mariadb-10.3","mariadb-10.4","mariadb-10.5","mariadb-10.6", "mariadb-10.7","mssql-2017","mssql-2019","mssql-2022","crdb-23.1","crdb-23.2","crdb-24.1","percona-xtradb-cluster-5.7","percona-xtradb-cluster-8.0", - "edb-edb-12","edb-edb-13","edb-edb-14","edb-edb-15","db2-luw","H2Database-2.2","sqlite","derby","firebird-3","firebird-4", + "edb-edb-12","edb-edb-13","edb-edb-14","edb-edb-15","edb-edb-16","db2-luw","H2Database-2.2","sqlite","derby","firebird-3","firebird-4", "hsqldb-2.4","hsqldb-2.5","diff"]' }} testClasses: ${{ 'AdvancedHarnessSuiteTest' }} steps: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 68a8804c1..f13aa4d61 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -81,10 +81,12 @@ on: "edb-postgres-13", "edb-postgres-14", "edb-postgres-15", + "edb-postgres-16", "edb-edb-12", "edb-edb-13", "edb-edb-14", "edb-edb-15", + "edb-edb-16", "derby", "sqlite", "hsqldb-2.4", @@ -115,8 +117,8 @@ jobs: databases: ${{ github.event.inputs.databases || '["mysql-5.6","mysql-5.7","mysql-8","percona-xtradb-cluster-5.7","percona-xtradb-cluster-8.0", "postgres-12","postgres-13","postgres-14","postgres-15","postgres-16","mariadb-10.2","mariadb-10.3","mariadb-10.4","mariadb-10.5","mariadb-10.6", "mariadb-10.7","mssql-2017","mssql-2019","mssql-2022","H2Database-2.2","crdb-23.1","crdb-23.2","crdb-24.1", - "edb-postgres-12","edb-postgres-13","edb-postgres-14","edb-postgres-15", - "edb-edb-12","edb-edb-13","edb-edb-14","edb-edb-15","derby","sqlite","hsqldb-2.4","hsqldb-2.5","firebird-3","firebird-4","db2-luw"]' }} + "edb-postgres-12","edb-postgres-13","edb-postgres-14","edb-postgres-15","edb-postgres-16", + "edb-edb-12","edb-edb-13","edb-edb-14","edb-edb-15","edb-edb-16","derby","sqlite","hsqldb-2.4","hsqldb-2.5","firebird-3","firebird-4","db2-luw"]' }} testClasses: ${{ inputs.testClasses || 'LiquibaseHarnessSuiteTest' }} steps: - uses: actions/checkout@v4 diff --git a/src/test/resources/automation-runner.sh b/src/test/resources/automation-runner.sh index 582e96e25..b17f36e0e 100755 --- a/src/test/resources/automation-runner.sh +++ b/src/test/resources/automation-runner.sh @@ -92,6 +92,9 @@ case $db in "edb-postgres-15" ) test_command mvn -ntp -Dtest=$tc -DdbName=edb-postgres -DdbVersion=15 test ;; + "edb-postgres-16" ) + test_command mvn -ntp -Dtest=$tc -DdbName=edb-postgres -DdbVersion=16 test + ;; "edb-edb-12" ) test_command mvn -ntp -Dtest=$tc -DdbName=edb-edb -DdbVersion=12 test ;; @@ -104,6 +107,9 @@ case $db in "edb-edb-15" ) test_command mvn -ntp -Dtest=$tc -DdbName=edb-edb -DdbVersion=15 test ;; + "edb-edb-16" ) + test_command mvn -ntp -Dtest=$tc -DdbName=edb-edb -DdbVersion=16 test + ;; "derby" ) test_command mvn -ntp -Dtest=$tc -DdbName=derby test ;; diff --git a/src/test/resources/docker/docker-compose.yml b/src/test/resources/docker/docker-compose.yml index 1e82ead9c..5c8d5cab8 100644 --- a/src/test/resources/docker/docker-compose.yml +++ b/src/test/resources/docker/docker-compose.yml @@ -131,6 +131,28 @@ services: volumes: - "./postgres-init.sh:/docker-entrypoint-initdb.d/postgres-init.sh" + edb-postgres-16: + image: ghcr.io/enterprisedb/postgresql:16 + ports: + - "5509:5432" + restart: always + environment: + POSTGRES_PASSWORD: LbRootPass1 + POSTGRES_DB: lbcat + volumes: + - "./postgres-init.sh:/docker-entrypoint-initdb.d/postgres-init.sh" + + edb-edb-16: + image: ghcr.io/enterprisedb/postgresql:16 + ports: + - "5510:5432" + restart: always + environment: + POSTGRES_PASSWORD: LbRootPass1 + POSTGRES_DB: lbcat + volumes: + - "./postgres-init.sh:/docker-entrypoint-initdb.d/postgres-init.sh" + mariadb-10.2: image: mariadb:10.2 ports: diff --git a/src/test/resources/harness-config.yml b/src/test/resources/harness-config.yml index 6c33b4216..486eaef68 100644 --- a/src/test/resources/harness-config.yml +++ b/src/test/resources/harness-config.yml @@ -209,6 +209,13 @@ databasesUnderTest: username: lbuser password: LiquibasePass1 + - name: edb-postgres + prefix: docker + version: 16 + url: jdbc:postgresql://localhost:5509/lbcat + username: lbuser + password: LiquibasePass1 + - name: edb-edb prefix: docker version: 12 @@ -237,6 +244,13 @@ databasesUnderTest: username: lbuser password: LiquibasePass1 + - name: edb-edb + prefix: docker + version: 16 + url: jdbc:edb://localhost:5510/lbcat + username: lbuser + password: LiquibasePass1 + - name: h2 prefix: local url: jdbc:h2:file:./src/test/resources/H2/lbcat