Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DAT-16270] added EDB-16 #868

Merged
merged 3 commits into from
Aug 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/advanced.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"snapshot": {
"objects": {
"liquibase.structure.core.View": [
{
"view": {
"definition": "SELECT id,\n first_name,\n last_name,\n email\n FROM authors;",
"name": "test_view"
}
}]
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"snapshot": {
"objects": {
"liquibase.structure.core.View": [
{
"view": {
"definition": "SELECT id,\n first_name,\n last_name,\n email\n FROM authors;",
"name": "test_view"
}
}]
}
}
}
6 changes: 6 additions & 0 deletions src/test/resources/automation-runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
;;
Expand All @@ -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
;;
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/docker/create-infra.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ case $db in
;;

# edb setup requires login to private registry
"edb-postgres-12"|"edb-postgres-13"|"edb-postgres-14"|"edb-postgres-15"|"edb-edb-12"|"edb-edb-13"|"edb-edb-14"|"edb-edb-15")
"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")
docker login $REPO_URL -u $REPO_USER -p $REPO_PASSWORD
docker compose -f docker-compose.edb.yml up -d $db
exit 0
Expand Down
12 changes: 12 additions & 0 deletions src/test/resources/docker/docker-compose.edb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ services:
- "5508:5444"
restart: always

edb-postgres-16:
image: docker.liquibase.net/datical-enterprisedb-edbas16
ports:
- "5509:5444"
restart: always

# We are providing second set of EDB images to run tests with EDB driver
# Without it tests will run in parallel and interfere with each other

Expand All @@ -55,4 +61,10 @@ services:
image: docker.liquibase.net/datical-enterprisedb-edbas15:latest
ports:
- "5515:5444"
restart: always

edb-edb-16:
image: docker.liquibase.net/datical-enterprisedb-edbas16
ports:
- "5516:5444"
restart: always
2 changes: 1 addition & 1 deletion src/test/resources/docker/teardown-infra.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ db=$1

case $db in
# edb specific teardown
"edb-postgres-12"|"edb-postgres-13"|"edb-postgres-14"|"edb-postgres-15"|"edb-edb-12"|"edb-edb-13"|"edb-edb-14"|"edb-edb-15")
"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")
docker compose -f docker-compose.edb.yml down --volumes
exit 0
;;
Expand Down
14 changes: 14 additions & 0 deletions src/test/resources/harness-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -237,6 +244,13 @@ databasesUnderTest:
username: lbuser
password: LiquibasePass1

- name: edb-edb
prefix: docker
version: 16
url: jdbc:edb://localhost:5516/lbcat
username: lbuser
password: LiquibasePass1

- name: h2
prefix: local
url: jdbc:h2:file:./src/test/resources/H2/lbcat
Expand Down
Loading