Standardize runner across CI

ubuntu-latest is still at 22.04 on github (see https://github.com/actions/runner-images). Since we rely on polkit for some policies and there was a big set of changes on the package between 22.04 and 24.04, we need to bump the runners to match the docker container that we use for the integration tests. To do that, it's better to use repo variables to control the runner so that we can switch back to ubuntu-latest once it moves on to 24.04.
ubuntu · Aug 9, 2024 · 293224d · 293224d
1 parent a85e6e1
commit 293224d
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/cla-check.yaml b/.github/workflows/cla-check.yaml
@@ -5,7 +5,7 @@ on:
 jobs:
   cla-check:
     name: Check if CLA is signed
-    runs-on: ubuntu-latest
+    runs-on: ${{ vars.RUNNER }}
     steps:
       - name: Check if CLA signed
         uses: canonical/has-signed-canonical-cla@v1

diff --git a/.github/workflows/e2e-build-images.yaml b/.github/workflows/e2e-build-images.yaml
@@ -17,7 +17,7 @@ on:
 jobs:
   supported-releases:
     name: Build matrix for supported ADSys and Ubuntu releases
-    runs-on: ubuntu-latest
+    runs-on: ${{ vars.RUNNER }}
     outputs:
       matrix: ${{ steps.set-supported-releases.outputs.matrix }}
       versions: ${{ steps.set-supported-releases.outputs.versions }}
@@ -61,7 +61,7 @@ jobs:
 
   build-template:
     name: Build VM template
-    runs-on: ubuntu-latest
+    runs-on: ${{ vars.RUNNER }}
     concurrency:
       group: template-build-${{ matrix.codename }}
     needs:

diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
@@ -25,7 +25,7 @@ on:
 jobs:
   supported-releases:
     name: Build matrix for supported ADSys and Ubuntu releases
-    runs-on: ubuntu-latest
+    runs-on: ${{ vars.RUNNER }}
     outputs:
       matrix: ${{ steps.set-supported-releases.outputs.matrix }}
     steps:
@@ -77,7 +77,7 @@ jobs:
 
   tests:
     name: Tests
-    runs-on: ubuntu-latest
+    runs-on: ${{ vars.RUNNER }}
     needs:
       - supported-releases
     strategy:

diff --git a/.github/workflows/patch-vendored-samba.yaml b/.github/workflows/patch-vendored-samba.yaml
@@ -14,7 +14,7 @@ env:
 jobs:
   check-for-changes:
     name: Check for changes in vendored code
-    runs-on: ubuntu-latest
+    runs-on: ${{ vars.RUNNER }}
     outputs:
       changed: ${{ steps.compute-diff.outputs.changed }}
       samba-ref: ${{ steps.compute-diff.outputs.samba-ref }}
@@ -48,7 +48,7 @@ jobs:
 
   patch-vendored-code:
     name: Patch vendored code
-    runs-on: ubuntu-latest
+    runs-on: ${{ vars.RUNNER }}
     needs: check-for-changes
     if: ${{ needs.check-for-changes.outputs.changed == 'true' }}
     steps:

diff --git a/.github/workflows/policy-builds.yaml b/.github/workflows/policy-builds.yaml
@@ -13,7 +13,7 @@ on:
 jobs:
   build-admxgen:
     name: Build admxgen static binary
-    runs-on: ubuntu-latest
+    runs-on: ${{ vars.RUNNER }}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
@@ -33,7 +33,7 @@ jobs:
 
   supported-releases:
     name: Build matrix for supported ADSys, Ubuntu, and docker releases
-    runs-on: ubuntu-latest
+    runs-on: ${{ vars.RUNNER }}
     outputs:
       matrix: ${{ steps.set-supported-releases.outputs.matrix }}
     needs: build-admxgen
@@ -80,7 +80,7 @@ jobs:
 
   collect-releases:
     name: Collect supported keys on each releases
-    runs-on: ubuntu-latest
+    runs-on: ${{ vars.RUNNER }}
     needs:
       - build-admxgen
       - supported-releases
@@ -119,7 +119,7 @@ jobs:
 
   generate-ad:
     name: Merge keys to generated admx/adml
-    runs-on: ubuntu-latest
+    runs-on: ${{ vars.RUNNER }}
     needs: collect-releases
     strategy:
       matrix:
@@ -165,7 +165,7 @@ jobs:
 
   generate-doc:
     name: Merge keys to generated documentation
-    runs-on: ubuntu-latest
+    runs-on: ${{ vars.RUNNER }}
     needs: collect-releases
     steps:
       - name: Install needed binaries
@@ -202,7 +202,7 @@ jobs:
 
   integrate:
     name: Integrate policy changes in current git tree
-    runs-on: ubuntu-latest
+    runs-on: ${{ vars.RUNNER }}
     needs:
       - generate-ad
       - generate-doc
@@ -243,7 +243,7 @@ jobs:
 
   open-issue-on-fail:
     name: Open issue on failure
-    runs-on: ubuntu-latest
+    runs-on: ${{ vars.RUNNER }}
     needs: integrate
     if: ${{ failure() }}
     steps:

diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml
@@ -16,7 +16,7 @@ env:
 jobs:
   sanity:
     name: Code sanity
-    runs-on: ubuntu-latest
+    runs-on: ${{ vars.RUNNER }}
     steps:
       - name: Install dependencies
         run: |
@@ -43,7 +43,7 @@ jobs:
 
   tests:
     name: Tests
-    runs-on: ubuntu-latest
+    runs-on: ${{ vars.RUNNER }}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5

diff --git a/.github/workflows/sync-gh-jira.yaml b/.github/workflows/sync-gh-jira.yaml
@@ -4,7 +4,7 @@ on: [issues, issue_comment]
 jobs:
   sync-issues:
     name: Sync issues to Jira
-    runs-on: ubuntu-latest
+    runs-on: ${{ vars.RUNNER }}
     steps:
       - uses: canonical/sync-issues-github-jira@v1
         with:

diff --git a/.github/workflows/tics-report-daily.yaml b/.github/workflows/tics-report-daily.yaml
@@ -14,7 +14,7 @@ env:
 jobs:
   tics:
     name: TIOBE TiCS Framework
-    runs-on: ubuntu-latest
+    runs-on: ${{ vars.RUNNER }}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5