Skip to content

Commit

Permalink
Github: Update E2E related workflows
Browse files Browse the repository at this point in the history
* Use start task version 7
* Instruct the task to start the importer services
* Downgrade Ubuntu to 20.04, as 22.04 is no longer viable
  • Loading branch information
Huulivoide committed Sep 20, 2024
1 parent 979e0e2 commit d35986c
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@ jobs:
- run_java_tests
- push_to_registry
name: Run E2E tests
runs-on: ubuntu-22.04
# These must run on ubuntu 20.04 or older.
# The MS SQL server used by jore4-jore3-importer,
# does not run on Linux kernels newer than 6.6.x.
runs-on: ubuntu-20.04
steps:
- name: Extract metadata to env variables
uses: HSLdevcom/jore4-tools/github-actions/extract-metadata@extract-metadata-v1
Expand All @@ -82,3 +85,4 @@ jobs:
uses: HSLdevcom/jore4-tools/github-actions/run-ci@main
with:
jore3importer_version: "${{ env.IMAGE_NAME }}:${{ env.COMMIT_ID }}"
start_jore3_importer: "true"
7 changes: 4 additions & 3 deletions .github/workflows/generate-jooq.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,20 @@ on:
jobs:
generate-jooq:
name: Verifies whether generated jooq classes have been updated
# These must run on ubuntu 22.04 or older.
# These must run on ubuntu 20.04 or older.
# The MS SQL server used by jore4-jore3-importer,
# does not run on Linux kernels newer than 6.6.x.
runs-on: ubuntu-22.04
runs-on: ubuntu-20.04

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Start e2e env
uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v6
uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v7
with:
custom_docker_compose: ./docker/docker-compose.custom.yml
start_jore3_importer: "true"

- name: Set up JDK 17
uses: actions/setup-java@v4
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/java-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,20 @@ on:
jobs:
run-tests:
name: Run java tests
# These must run on ubuntu 22.04 or older.
# These must run on ubuntu 20.04 or older.
# The MS SQL server used by jore4-jore3-importer,
# does not run on Linux kernels newer than 6.6.x.
runs-on: ubuntu-22.04
runs-on: ubuntu-20.04

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Start e2e env
uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v6
uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v7
with:
custom_docker_compose: ./docker/docker-compose.custom.yml
start_jore3_importer: "true"

- name: Set up JDK 17
uses: actions/setup-java@v4
Expand Down

0 comments on commit d35986c

Please sign in to comment.