Update CI

Signed-off-by: Dan Webb <[email protected]>
sous-chefs · Dec 4, 2024 · 9c3e39c · 9c3e39c
1 parent ccef7eb
commit 9c3e39c
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 29 deletions.
diff --git a/.github/actions/test-kitchen/action.yml b/.github/actions/test-kitchen/action.yml
@@ -11,8 +11,6 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: Check out code
-      uses: actions/checkout@v4
     - name: Install Chef
       uses: actionshub/[email protected]
     - name: Dokken

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ name: ci
 
 jobs:
   lint-unit:
-    uses: sous-chefs/.github/.github/workflows/lint-unit.yml@3.1.1
+    uses: sous-chefs/.github/.github/workflows/lint-unit.yml@main
     permissions:
       actions: write
       checks: write
@@ -23,42 +23,65 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [
-          "almalinux-8",
-          "almalinux-9",
-          "amazonlinux-2023",
-          "centos-stream-8",
-          "centos-stream-9",
-          "debian-11",
-          "debian-12",
-          "rockylinux-8",
-          "rockylinux-9",
-          "ubuntu-2204",
-          "ubuntu-2404",
-        ]
-        suite: ["distro", "repo", "repo-overrides"]
+        os:
+          [
+            "almalinux-8",
+            "almalinux-9",
+            "amazonlinux-2023",
+            "centos-stream-9",
+            "centos-stream-10",
+            "debian-11",
+            "debian-12",
+            "rockylinux-8",
+            "rockylinux-9",
+            "ubuntu-2204",
+            "ubuntu-2404",
+          ]
+        suite: ["distro", "repo"]
     steps:
+      - name: Check out code
+        uses: actions/checkout@v4
       - uses: ./.github/actions/test-kitchen
         with:
           suite: ${{ matrix.suite }}
           os: ${{ matrix.os }}
 
+  # TODO: This is currently broken 
+  # integration-repo-overrides:
+  #   needs: lint-unit
+  #   runs-on: ubuntu-latest
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       os: ["ubuntu-2204", "ubuntu-2404"]
+  #       suite: ["repo-overrides"]
+  #   steps:
+  #     - name: Check out code
+  #       uses: actions/checkout@v4
+  #     - uses: ./.github/actions/test-kitchen
+  #       with:
+  #         suite: ${{ matrix.suite }}
+  #         os: ${{ matrix.os }}
+
   integration-epel:
     needs: lint-unit
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        os: [
-          "almalinux-8",
-          "almalinux-9",
-          "centos-stream-8",
-          "centos-stream-9",
-          "rockylinux-8",
-          "rockylinux-9",
-        ]
+        os:
+          [
+            "almalinux-8",
+            "almalinux-9",
+            "centos-stream-9",
+            "centos-stream-10",
+            "rockylinux-8",
+            "rockylinux-9",
+          ]
         suite: ["epel"]
     steps:
+      - name: Check out code
+        uses: actions/checkout@v4
       - uses: ./.github/actions/test-kitchen
         with:
           suite: ${{ matrix.suite }}
@@ -73,15 +96,18 @@ jobs:
         os: ["ubuntu-2204", "ubuntu-2404"]
         suite: ["distro-nginx-full"]
     steps:
+      - name: Check out code
+        uses: actions/checkout@v4
       - uses: ./.github/actions/test-kitchen
         with:
           suite: ${{ matrix.suite }}
           os: ${{ matrix.os }}
 
   final:
     runs-on: ubuntu-latest
-    needs: [integration, integration-nginx-full, integration-epel]
+    needs: [integration, integration-nginx-full, integration-epel, integration-repo-overrides]
     steps:
       - run: echo ${{needs.integration.outputs}}
       - run: echo ${{needs.integration-nginx-full.outputs}}
       - run: echo ${{needs.integration-epel.outputs}}
+      # - run: echo ${{needs.integration-repo-overrides.outputs}}
diff --git a/kitchen.global.yml b/kitchen.global.yml
@@ -18,7 +18,7 @@ platforms:
   - name: almalinux-8
   - name: almalinux-9
   - name: amazonlinux-2023
-  - name: centos-stream-9
+  - name: centos-stream-10
   - name: debian-11
   - name: debian-12
   - name: fedora-latest

diff --git a/kitchen.yml b/kitchen.yml
@@ -20,8 +20,8 @@ platforms:
   - name: almalinux-9
   - name: rockylinux-8
   - name: rockylinux-9
-  - name: centos-stream-8
   - name: centos-stream-9
+  - name: centos-stream-10
   - name: debian-11
   - name: debian-12
   - name: fedora-latest
@@ -73,8 +73,8 @@ suites:
     includes:
       - almalinux-8
       - almalinux-9
-      - centos-stream-8
       - centos-stream-9
+      - centos-stream-10
       - rockylinux-8
       - rockylinux-9
     verifier: