From fbe02d639ca3154823a9919479d94f6cf88885e2 Mon Sep 17 00:00:00 2001 From: Dan Webb Date: Wed, 4 Dec 2024 15:04:58 +0000 Subject: [PATCH] Update CI Signed-off-by: Dan Webb --- .github/actions/test-kitchen/action.yml | 2 - .github/workflows/ci.yml | 72 +++++++++++++++++-------- kitchen.global.yml | 2 +- kitchen.yml | 4 +- 4 files changed, 52 insertions(+), 28 deletions(-) diff --git a/.github/actions/test-kitchen/action.yml b/.github/actions/test-kitchen/action.yml index ceedf220..c018ca56 100644 --- 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/chef-install@3.0.0 - name: Dokken diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 20cb4128..5f56cd70 100644 --- 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,6 +96,8 @@ 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 }} @@ -85,3 +110,4 @@ jobs: - 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 index 1740e461..d7494b91 100644 --- 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 index c7711ce2..0e58634f 100644 --- 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: