diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd5bb235..3b0335ee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,48 @@ jobs: statuses: write issues: write + integration-epel: + needs: lint-unit + runs-on: ubuntu-latest + strategy: + matrix: + os: + - "almalinux-8" + - "almalinux-9" + - "centos-stream-8" + - "centos-stream-9" + - "rockylinux-8" + - "rockylinux-9" + suite: + - "epel" + steps: &steps + - name: Check out code + uses: actions/checkout@v4 + - name: Install Chef + uses: actionshub/chef-install@3.0.0 + - name: Dokken + uses: actionshub/test-kitchen@3.0.0 + env: + CHEF_LICENSE: accept-no-persist + KITCHEN_LOCAL_YAML: kitchen.dokken.yml + with: + suite: ${{ matrix.suite }} + os: ${{ matrix.os }} + + integration-nginx-full: + needs: lint-unit + runs-on: ubuntu-latest + strategy: + matrix: + os: + - "ubuntu-2204" + - "ubuntu-2404" + suite: + - "distro-nginx-full" + fail-fast: false + steps: + <<: *steps + integration: needs: lint-unit runs-on: ubuntu-latest @@ -26,91 +68,26 @@ jobs: - "almalinux-8" - "almalinux-9" - "amazonlinux-2023" - - "centos-7" - "centos-stream-8" - "centos-stream-9" - - "debian-10" - "debian-11" - - "opensuse-leap-15" + - "debian-12" - "rockylinux-8" - "rockylinux-9" - - "ubuntu-1804" - - "ubuntu-2004" + - "ubuntu-2204" + - "ubuntu-2404" suite: - "distro" - "repo" - "repo-overrides" - - "epel" - - "nginx-full" - exclude: - - os: "opensuse-leap-15" - suite: "repo" - - os: "centos-7" - suite: "distro" - - os: "amazonlinux-2023" - suite: "epel" - - os: "debian-9" - suite: "epel" - - os: "debian-10" - suite: "epel" - - os: "debian-11" - suite: "epel" - - os: "ubuntu-1804" - suite: "epel" - - os: "ubuntu-2004" - suite: "epel" - - os: "fedora-latest" - suite: "epel" - - os: "opensuse-leap-15" - suite: "epel" - - os: "amazonlinux-2023" - suite: "nginx-full" - - os: "centos-7" - suite: "nginx-full" - - os: "centos-stream-8" - suite: "nginx-full" - - os: "centos-stream-9" - suite: "nginx-full" - - os: "almalinux-8" - suite: "nginx-full" - - os: "almalinux-9" - suite: "nginx-full" - - os: "rockylinux-8" - suite: "nginx-full" - - os: "rockylinux-9" - suite: "nginx-full" - - os: "amazonlinux" - suite: "nginx-full" - - os: "debian-10" - suite: "nginx-full" - - os: "debian-11" - suite: "nginx-full" - - os: "fedora-latest" - suite: "nginx-full" - - os: "opensuse-leap-15" - suite: "nginx-full" - - os: "amazonlinux-2023" - suite: "repo-overrides" - - os: "centos-7" - suite: "repo-overrides" - - os: "debian-10" - suite: "repo-overrides" - - os: "opensuse-leap-15" - suite: "repo-overrides" - - os: "ubuntu-1804" - suite: "repo-overrides" fail-fast: false + steps: + <<: *steps + final: + runs-on: ubuntu-latest + needs: [integration, integration-nginx-full, integration-epel] steps: - - name: Check out code - uses: actions/checkout@v4 - - name: Install Chef - uses: actionshub/chef-install@3.0.0 - - name: Dokken - uses: actionshub/test-kitchen@3.0.0 - env: - CHEF_LICENSE: accept-no-persist - KITCHEN_LOCAL_YAML: kitchen.dokken.yml - with: - suite: ${{ matrix.suite }} - os: ${{ matrix.os }} + - run: echo ${{needs.integration.outputs}} + - run: echo ${{needs.integration-nginx-full.outputs}} + - run: echo ${{needs.integration-epel.outputs}} diff --git a/CHANGELOG.md b/CHANGELOG.md index 723e5524..715ab0ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ This file is used to list changes made in each version of the nginx cookbook. ## Unreleased Fix Rspec issues +Update workflows ## 12.2.10 - *2024-07-10* diff --git a/README.md b/README.md index 129aecbf..8ed7e144 100644 --- a/README.md +++ b/README.md @@ -24,18 +24,16 @@ The following cookbooks are direct dependencies because they're used for common The following platforms are supported and tested with Test Kitchen: -- Amazon Linux 2 -- CentOS 7 -- Debian 8+ -- Fedora 30 -- openSUSE Leap 15 -- Ubuntu 16.04+ - -Other Debian and RHEL family distributions are assumed to work. +- AlmaLinux 8/9 +- Rocky Linux 8/9 +- CentOS Stream 8/9 +- Amazon Linux 2023 +- Debian 11/12 +- Ubuntu 22.04/24.04 ### Chef -- Chef 14+ +- Chef 15.3+ ## Resources diff --git a/kitchen.yml b/kitchen.yml index 94d539a1..c7711ce2 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -15,25 +15,24 @@ verifier: name: inspec platforms: + - name: amazonlinux-2023 - name: almalinux-8 - - name: amazonlinux-2 - - name: centos-7 + - name: almalinux-9 + - name: rockylinux-8 + - name: rockylinux-9 - name: centos-stream-8 - - name: debian-10 + - name: centos-stream-9 - name: debian-11 + - name: debian-12 - name: fedora-latest - - name: opensuse-leap-15 - - name: rockylinux-8 - - name: ubuntu-18.04 - - name: ubuntu-20.04 + - name: ubuntu-22.04 + - name: ubuntu-24.04 suites: - name: distro run_list: - recipe[test::distro] - recipe[test::test_site] - excludes: - - centos-7 verifier: inspec_tests: - test/integration/default @@ -43,8 +42,8 @@ suites: - recipe[test::distro_nginx-full] - recipe[test::test_site] includes: - - ubuntu-18.04 - - ubuntu-20.04 + - ubuntu-22.04 + - ubuntu-24.04 verifier: inspec_tests: - test/integration/default @@ -62,16 +61,6 @@ suites: run_list: - recipe[test::repo_overrides] - recipe[test::test_site] - includes: - - almalinux-8 - - almalinux-9 - - centos-stream-8 - - centos-stream-9 - - debian-11 - - fedora-latest - - rockylinux-8 - - rockylinux-9 - - ubuntu-20.04 verifier: inspec_tests: - test/integration/default @@ -84,7 +73,6 @@ suites: includes: - almalinux-8 - almalinux-9 - - centos-7 - centos-stream-8 - centos-stream-9 - rockylinux-8