parameterise staging CI job for ubuntu version

freedomofpress · Nov 27, 2024 · eccb535 · eccb535
1 parent afdbb6d
commit eccb535
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -9,9 +9,13 @@ on:
 
 jobs:
   staging:
+    strategy:
+      matrix:
+        ubuntu_version: ["focal", "noble"]
     runs-on: ubuntu-latest
     env:
       GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CREDENTIALS }}
+      UBUNTU_VERSION: ${{ matrix.ubuntu_version }}
     steps:
       - uses: actions/checkout@v4
       - name: Run staging tests on GCE

diff --git a/devops/gce-nested/ci-go.sh b/devops/gce-nested/ci-go.sh
@@ -12,7 +12,7 @@ set -e
 set -u
 set -o pipefail
 
-export BASE_OS="${BASE_OS:-focal}"
+export UBUNTU_VERSION="${UBUNTU_VERSION:-focal}"
 
 ./devops/gce-nested/gce-start.sh
 ./devops/gce-nested/gce-runner.sh

diff --git a/devops/gce-nested/gce-runner.sh b/devops/gce-nested/gce-runner.sh
@@ -4,7 +4,7 @@
 # for storage as artifacts on the build, so devs can review via web.
 set -e
 set -u
-BASE_OS="${BASE_OS:-focal}"
+UBUNTU_VERSION="${UBUNTU_VERSION:-focal}"
 
 
 TOPLEVEL="$(git rev-parse --show-toplevel)"
@@ -56,6 +56,6 @@ copy_securedrop_repo
 # so register a trap to ensure the fetch always runs.
 trap fetch_junit_test_results EXIT
 
-ssh_gce "make build-debs-notest"
-ssh_gce "make build-debs-ossec-notest"
-ssh_gce "make staging"
+ssh_gce "UBUNTU_VERSION=\"${UBUNTU_VERSION}\" make build-debs-notest"
+ssh_gce "UBUNTU_VERSION=\"${UBUNTU_VERSION}\" make build-debs-ossec-notest"
+ssh_gce "UBUNTU_VERSION=\"${UBUNTU_VERSION}\" make staging"