From e23a251e4ef9fde9fb90776debb3e0813c4794d7 Mon Sep 17 00:00:00 2001 From: Jesse Jaara Date: Fri, 20 Sep 2024 12:12:14 +0300 Subject: [PATCH] Github: Update E2E tasks --- .github/workflows/cd.yml | 19 +++++-------------- .github/workflows/check-dump.yml | 9 +++------ 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 7358dbbb..bdbd4e14 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -96,10 +96,7 @@ jobs: - run-docker-image-tests - push_to_registry name: Run migration tests - # These must run on ubuntu 22.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-24.04 strategy: matrix: @@ -113,7 +110,7 @@ jobs: uses: HSLdevcom/jore4-tools/github-actions/extract-metadata@extract-metadata-v1 - 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: hasura_version: '${{ env.IMAGE_NAME }}:${{ matrix.imagePrefix }}${{ env.COMMIT_ID }}' @@ -127,10 +124,7 @@ jobs: - run-docker-image-tests - push_to_registry name: Run hasura integration tests - # These must run on ubuntu 22.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-24.04 strategy: matrix: @@ -148,7 +142,7 @@ jobs: uses: HSLdevcom/jore4-tools/github-actions/extract-metadata@extract-metadata-v1 - 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: hasura_version: '${{ env.IMAGE_NAME }}:${{ matrix.imagePrefix }}${{ env.COMMIT_ID }}' @@ -167,10 +161,7 @@ jobs: - run_migration_tests - run_integration_tests name: Run e2e tests - # These must run on ubuntu 22.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-24.04 steps: - name: Extract metadata to env variables diff --git a/.github/workflows/check-dump.yml b/.github/workflows/check-dump.yml index ed4fc8ae..739076da 100644 --- a/.github/workflows/check-dump.yml +++ b/.github/workflows/check-dump.yml @@ -6,10 +6,7 @@ on: jobs: check_dumps: name: Check if the generated dumps are up to date - # These must run on ubuntu 22.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-24.04 steps: - name: Checkout code @@ -19,7 +16,7 @@ jobs: uses: HSLdevcom/jore4-tools/github-actions/extract-metadata@extract-metadata-v1 - 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: hasura_version: '${{ env.IMAGE_NAME }}:generic-${{ env.COMMIT_ID }}' @@ -33,7 +30,7 @@ jobs: run: docker rm --force hasura && docker volume prune --force - name: Restart the hasura container to rerun the repeatable migrations - 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: hasura_version: '${{ env.IMAGE_NAME }}:generic-${{ env.COMMIT_ID }}'