Merge pull request #1405 from tesshuflower/ci-ubuntu-24.x

Ci ubuntu 24.x
backube · Oct 15, 2024 · d7e3235 · d7e3235
2 parents b46916a + a1f6e1f
commit d7e3235
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 14 deletions.
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -14,7 +14,7 @@ on:  # yamllint disable-line rule:truthy
 jobs:
   build-docs:
     name: Build docs
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout source

diff --git a/.github/workflows/operator.yml b/.github/workflows/operator.yml
@@ -23,25 +23,41 @@ env:
 jobs:
   lint:
     name: Lint
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout source
         uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
+      - name: Setup Python
+        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
+        with:
+          python-version: '3.10'
+          cache: 'pip'
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.3'
+
       - name: Install pre-commit
         run: |
+          python --version
           python -m pip install --user pre-commit
           echo "PYHASH=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
+          echo "#### ImageOS is: $ImageOS ####"
+          echo "#### ImageVersion is: $ImageVersion ####"
+          echo "ImageOS=${ImageOS}" >> $GITHUB_ENV
+          echo "ImageVersion=${ImageVersion}" >> $GITHUB_ENV
 
       - name: Enable cache for pre-commit hooks
         uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
         with:
           path: ~/.cache/pre-commit
-          key: pre-commit|${{ env.PYHASH }}|${{ hashFiles('.pre-commit-config.yaml') }}
+          key: pre-commit|${{ env.ImageOS }}|${{ env.ImageVersion }}|${{ env.PYHASH }}|${{ hashFiles('.pre-commit-config.yaml') }}
           restore-keys: |
-            pre-commit|${{ env.PYHASH }}
-            pre-commit|
+            pre-commit|${{ env.ImageOS }}|${{ env.ImageVersion }}|${{ env.PYHASH }}
+            pre-commit|${{ env.ImageOS }}|${{ env.ImageVersion }}|
 
       - name: Run pre-commit checks
         run: |
@@ -50,7 +66,7 @@ jobs:
 
   generated-files-check:
     name: Auto Generated Files Check
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout source
@@ -130,7 +146,7 @@ jobs:
 
   test-operator:
     name: Test-operator
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout source
@@ -169,7 +185,7 @@ jobs:
 
   build-operator:
     name: Build-operator
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout source
@@ -189,7 +205,7 @@ jobs:
 
   build-scorecard:
     name: Build-custom-scorecard-tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout source
@@ -226,7 +242,7 @@ jobs:
 
   kubectl-plugin:
     name: kubectl-plugin
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       KUBECONFIG: /tmp/kubeconfig
       KUBERNETES_VERSION: "1.25.0"
@@ -275,7 +291,7 @@ jobs:
   e2e:
     name: End-to-end
     needs: [build-operator, kubectl-plugin]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -404,7 +420,7 @@ jobs:
   e2e-success:
     name: Successful e2e tests
     needs: [e2e, lint, generated-files-check, test-operator, build-scorecard]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Success
         run: echo "Previous steps were successful"
@@ -420,7 +436,7 @@ jobs:
       (github.ref == 'refs/heads/main' ||
        startsWith(github.ref, 'refs/heads/release-') ||
        startsWith(github.ref, 'refs/tags/v'))
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: No-op
         run: /bin/true

diff --git a/.github/workflows/periodic.yml b/.github/workflows/periodic.yml
@@ -24,7 +24,7 @@ on:  # yamllint disable-line rule:truthy
 jobs:
   trigger-workflows:
     name: Trigger other workflows
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       # Must checkout source or gh can't figure out what to trigger