Skip to content

Commit 72f609e

Browse files
authored
Add schema versions to matrix (#1234)
Run integration tests with current released version and latest-dev to verify operations behave gracefully for various updates. NOTE: added release currently being deployed only, discovered that the actual database version wasn't getting embedded into the ready database or schema install images and so was always 99.99.99.
1 parent bd4ac6c commit 72f609e

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

.github/workflows/build.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
jdk: [8, 11]
17+
schema:
18+
- "ghcr.io/hydrologicengineeringcenter/cwms-database/cwms/database-ready-ora-23.5:latest-dev"
19+
- "ghcr.io/hydrologicengineeringcenter/cwms-database/cwms/database-ready-ora-23.5:25-07-01-RC06"
1720
name: build and test
1821
runs-on: ubuntu-latest
1922
outputs:
@@ -31,7 +34,7 @@ jobs:
3134
id: thebuild
3235
run: ./gradlew build --info --init-script init.gradle
3336
- name: integration tests
34-
run: ./gradlew integrationtest --info --init-script init.gradle
37+
run: ./gradlew integrationtest --info --init-script init.gradle -PCDA.oracle.database.image=${{matrix.schema}}
3538
- name: Publish Test Report
3639
uses: mikepenz/action-junit-report@v5
3740
if: success() || failure() # always run even if the previous step fails

cwms-data-api/src/test/java/fixtures/CwmsDataApiSetupCallback.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ else if(tmp.toLowerCase().endsWith("staging")) {
103103
}
104104
else
105105
{
106-
ret = Dao.versionAsInteger(tmp);
106+
ret = Dao.versionAsInteger(tmp.replaceAll("-RC.*", "").replace("-","."));
107107
}
108108
return ret;
109109
}

0 commit comments

Comments
 (0)