From 231a5f8dde84b760f34ebf0c17560a7bad09405d Mon Sep 17 00:00:00 2001 From: Dan Webb Date: Mon, 6 Jan 2025 11:58:47 +0000 Subject: [PATCH] SQUASHME Signed-off-by: Dan Webb --- .github/workflows/ci.yml | 3 ++- kitchen.yml | 26 +++++++++++--------------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 89a02a2..9517805 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: - "centos-stream-10" - "debian-11" - "debian-12" - - "opensuse-leap-15" + # - "opensuse-leap-15" - "ubuntu-2204" - "ubuntu-2404" suite: @@ -46,6 +46,7 @@ jobs: env: CHEF_LICENSE: accept-no-persist KITCHEN_LOCAL_YAML: kitchen.dokken.yml + CHEF_VERSION: ${{ vars.CHEF_VERSION }} with: suite: ${{ matrix.suite }} os: ${{ matrix.os }} diff --git a/kitchen.yml b/kitchen.yml index 2022c09..75f81f8 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -5,30 +5,26 @@ driver: provisioner: name: chef_infra deprecations_as_errors: true - enforce_idempotency: true - multiple_converge: 2 - chef_license: accept + chef_license: accept-no-persist product_name: chef product_version: <%= ENV['CHEF_VERSION'] || 'latest' %> - install_strategy: always - log_level: <%= ENV['CHEF_LOG_LEVEL'] || 'auto' %> - + install_strategy: once + enforce_idempotency: true + multiple_converge: 2 verifier: name: inspec platforms: - - name: almalinux-8 - - name: amazonlinux-2 - - name: centos-7 - - name: centos-stream-8 - - name: debian-10 + - name: almalinux-9 + - name: amazonlinux-2023 + - name: centos-stream-9 + - name: centos-stream-10 - name: debian-11 - - name: fedora-latest + - name: debian-12 - name: opensuse-leap-15 - - name: ubuntu-18.04 - - name: ubuntu-20.04 - - name: rockylinux-8 + - name: ubuntu-2204 + - name: ubuntu-2404 suites: - name: default