Skip to content

Commit 85d5880

Browse files
committed
[ci] Add further targets for testing in CI
1 parent 96eacdf commit 85d5880

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,15 @@ jobs:
2121
retention-days: 1
2222

2323
integration-test:
24-
name: Integration Test (DB API ${{ matrix.db-api-version }}.x.x)
24+
name: Integration Test (DB API ${{ matrix.db-image }} ${{ matrix.db-api-version }})
2525
needs: build
2626
runs-on: ubuntu-latest
2727
env:
2828
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
2929
strategy:
3030
fail-fast: false
3131
matrix:
32+
db-image: [existdb/existdb, evolvedbinary/elemental]
3233
db-api-version: [6, 7]
3334
steps:
3435
- uses: actions/checkout@v4
@@ -41,5 +42,13 @@ jobs:
4142
- uses: actions/download-artifact@v4
4243
with:
4344
name: target
44-
- name: Maven Integration Test
45-
run: mvn verify -Dgpg.skip -P docker-integration-test-db-api-${{ matrix.db-api-version }},cypress-with-recording-db-api-${{ matrix.db-api-version }}
45+
- name: "Maven Integration Test: ${{ matrix.db-image }} ${{ matrix.db-api-version }}"
46+
run: mvn verify -Dgpg.skip -Ddocker.integration-test.db-image=${{ matrix.db-image }} -P docker-integration-test-db-api-${{ matrix.db-api-version }},cypress-with-recording-db-api-${{ matrix.db-api-version }}
47+
if: ${{ (matrix.db-image == 'existdb/existdb' && matrix.db-api-version == '6') || (matrix.db-image == 'evolvedbinary/elemental' && matrix.db-api-version == '7') }}
48+
- name: "Maven Integration Test: ${{ matrix.db-image }} ${{ matrix.db-api-version }}"
49+
run: mvn verify -Dgpg.skip -Ddocker.integration-test.db-image=${{ matrix.db-image }} -Ddb.api.6.impl.version=6.6.1 -P docker-integration-test-db-api-${{ matrix.db-api-version }},cypress-with-recording-db-api-${{ matrix.db-api-version }}
50+
if: ${{ matrix.db-image == 'evolvedbinary/elemental' && matrix.db-api-version == '6' }}
51+
- name: "Maven Integration Test: ${{ matrix.db-image }} ${{ matrix.db-api-version }}"
52+
run: mvn verify -Dgpg.skip -Ddocker.integration-test.db-image=${{ matrix.db-image }} -Ddb.api.7.impl.version=latest -P docker-integration-test-db-api-${{ matrix.db-api-version }},cypress-with-recording-db-api-${{ matrix.db-api-version }}
53+
if: ${{ matrix.db-image == 'existdb/existdb' && matrix.db-api-version == '7' }}
54+

pom.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@
271271
<activeByDefault>true</activeByDefault>
272272
</activation>
273273
<properties>
274+
<docker.integration-test.db-image>existdb/existdb</docker.integration-test.db-image>
274275
<docker.integration-test.db-api-6.dir>${project.build.directory}/docker-integration-test/db-api-6</docker.integration-test.db-api-6.dir>
275276
<docker.integration-test.db-api-6.autodeploy.dir>${docker.integration-test.db-api-6.dir}/autodeploy</docker.integration-test.db-api-6.autodeploy.dir>
276277
</properties>
@@ -330,7 +331,7 @@
330331
<images>
331332
<image>
332333
<alias>db-api-6-monex-tests</alias>
333-
<name>existdb/existdb:${db.api.6.impl.version}</name>
334+
<name>${docker.integration-test.db-image}:${db.api.6.impl.version}</name>
334335
<run>
335336
<containerNamePattern>%a-%i</containerNamePattern>
336337
<ports>
@@ -381,6 +382,7 @@
381382
<activeByDefault>true</activeByDefault>
382383
</activation>
383384
<properties>
385+
<docker.integration-test.db-image>evolvedbinary/elemental</docker.integration-test.db-image>
384386
<docker.integration-test.db-api-7.dir>${project.build.directory}/docker-integration-test/db-api-7</docker.integration-test.db-api-7.dir>
385387
<docker.integration-test.db-api-7.autodeploy.dir>${docker.integration-test.db-api-7.dir}/autodeploy</docker.integration-test.db-api-7.autodeploy.dir>
386388
</properties>
@@ -440,7 +442,7 @@
440442
<images>
441443
<image>
442444
<alias>db-api-7-monex-tests</alias>
443-
<name>evolvedbinary/elemental:${db.api.7.impl.version}</name>
445+
<name>${docker.integration-test.db-image}:${db.api.7.impl.version}</name>
444446
<run>
445447
<containerNamePattern>%a-%i</containerNamePattern>
446448
<ports>

0 commit comments

Comments
 (0)