From 10aecefa7fbbe71a96054d5ff147697ecfd7e0d8 Mon Sep 17 00:00:00 2001 From: Dafydd Jones Date: Tue, 15 Jul 2025 15:38:01 +0100 Subject: [PATCH] ci: update images for v3006.14 & v3007.6 --- .github/workflows/main.yml | 20 ++--- .gitlab-ci.yml | 72 +++++++++--------- kitchen.yml | 148 ++++++++++++++++++------------------- 3 files changed, 120 insertions(+), 120 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5cdb7c77..35696fd3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -72,16 +72,16 @@ jobs: - ubuntu-2404-master - ubuntu-2204-master - ubuntu-2004-master - - debian-12-3007-5 - - debian-11-3007-5 - - ubuntu-2404-3007-5 - - ubuntu-2204-3007-5 - - ubuntu-2004-3007-5 - - debian-12-3006-13 - - debian-11-3006-13 - - ubuntu-2404-3006-13 - - ubuntu-2204-3006-13 - - ubuntu-2004-3006-13 + - debian-12-3007-6 + - debian-11-3007-6 + - ubuntu-2404-3007-6 + - ubuntu-2204-3007-6 + - ubuntu-2004-3007-6 + - debian-12-3006-14 + - debian-11-3006-14 + - ubuntu-2404-3006-14 + - ubuntu-2204-3006-14 + - ubuntu-2004-3006-14 steps: - name: Debug on runner (When re-run with "Enable debug logging" checked) if: runner.debug diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a1f0d39a..6b0da106 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -231,42 +231,42 @@ rockylinux-8-master: {extends: '.test_instance_failure_permitted'} ubuntu-2404-master: {extends: '.test_instance_failure_permitted'} ubuntu-2204-master: {extends: '.test_instance_failure_permitted'} ubuntu-2004-master: {extends: '.test_instance_failure_permitted'} -almalinux-9-3007-5: {extends: '.test_instance'} -almalinux-8-3007-5: {extends: '.test_instance'} -amazonlinux-2023-3007-5: {extends: '.test_instance'} -amazonlinux-2-3007-5: {extends: '.test_instance_failure_permitted'} -centos-stream9-3007-5: {extends: '.test_instance'} -debian-12-3007-5: {extends: '.test_instance'} -debian-11-3007-5: {extends: '.test_instance'} -fedora-41-3007-5: {extends: '.test_instance_failure_permitted'} -fedora-40-3007-5: {extends: '.test_instance'} -opensuse-leap-156-3007-5: {extends: '.test_instance'} -opensuse-tmbl-latest-3007-5: {extends: '.test_instance'} -oraclelinux-9-3007-5: {extends: '.test_instance'} -oraclelinux-8-3007-5: {extends: '.test_instance'} -rockylinux-9-3007-5: {extends: '.test_instance'} -rockylinux-8-3007-5: {extends: '.test_instance'} -ubuntu-2404-3007-5: {extends: '.test_instance'} -ubuntu-2204-3007-5: {extends: '.test_instance'} -ubuntu-2004-3007-5: {extends: '.test_instance'} -almalinux-9-3006-13: {extends: '.test_instance'} -almalinux-8-3006-13: {extends: '.test_instance'} -amazonlinux-2023-3006-13: {extends: '.test_instance'} -amazonlinux-2-3006-13: {extends: '.test_instance_failure_permitted'} -centos-stream9-3006-13: {extends: '.test_instance'} -debian-12-3006-13: {extends: '.test_instance'} -debian-11-3006-13: {extends: '.test_instance'} -fedora-41-3006-13: {extends: '.test_instance_failure_permitted'} -fedora-40-3006-13: {extends: '.test_instance'} -opensuse-leap-156-3006-13: {extends: '.test_instance'} -opensuse-tmbl-latest-3006-13: {extends: '.test_instance'} -oraclelinux-9-3006-13: {extends: '.test_instance'} -oraclelinux-8-3006-13: {extends: '.test_instance'} -rockylinux-9-3006-13: {extends: '.test_instance'} -rockylinux-8-3006-13: {extends: '.test_instance'} -ubuntu-2404-3006-13: {extends: '.test_instance'} -ubuntu-2204-3006-13: {extends: '.test_instance'} -ubuntu-2004-3006-13: {extends: '.test_instance'} +almalinux-9-3007-6: {extends: '.test_instance'} +almalinux-8-3007-6: {extends: '.test_instance'} +amazonlinux-2023-3007-6: {extends: '.test_instance'} +amazonlinux-2-3007-6: {extends: '.test_instance_failure_permitted'} +centos-stream9-3007-6: {extends: '.test_instance'} +debian-12-3007-6: {extends: '.test_instance'} +debian-11-3007-6: {extends: '.test_instance'} +fedora-41-3007-6: {extends: '.test_instance_failure_permitted'} +fedora-40-3007-6: {extends: '.test_instance'} +opensuse-leap-156-3007-6: {extends: '.test_instance'} +opensuse-tmbl-latest-3007-6: {extends: '.test_instance'} +oraclelinux-9-3007-6: {extends: '.test_instance'} +oraclelinux-8-3007-6: {extends: '.test_instance'} +rockylinux-9-3007-6: {extends: '.test_instance'} +rockylinux-8-3007-6: {extends: '.test_instance'} +ubuntu-2404-3007-6: {extends: '.test_instance'} +ubuntu-2204-3007-6: {extends: '.test_instance'} +ubuntu-2004-3007-6: {extends: '.test_instance'} +almalinux-9-3006-14: {extends: '.test_instance'} +almalinux-8-3006-14: {extends: '.test_instance'} +amazonlinux-2023-3006-14: {extends: '.test_instance'} +amazonlinux-2-3006-14: {extends: '.test_instance_failure_permitted'} +centos-stream9-3006-14: {extends: '.test_instance'} +debian-12-3006-14: {extends: '.test_instance'} +debian-11-3006-14: {extends: '.test_instance'} +fedora-41-3006-14: {extends: '.test_instance_failure_permitted'} +fedora-40-3006-14: {extends: '.test_instance'} +opensuse-leap-156-3006-14: {extends: '.test_instance'} +opensuse-tmbl-latest-3006-14: {extends: '.test_instance'} +oraclelinux-9-3006-14: {extends: '.test_instance'} +oraclelinux-8-3006-14: {extends: '.test_instance'} +rockylinux-9-3006-14: {extends: '.test_instance'} +rockylinux-8-3006-14: {extends: '.test_instance'} +ubuntu-2404-3006-14: {extends: '.test_instance'} +ubuntu-2204-3006-14: {extends: '.test_instance'} +ubuntu-2004-3006-14: {extends: '.test_instance'} # yamllint enable rule:line-length ############################################################################### diff --git a/kitchen.yml b/kitchen.yml index c78fceb9..a40524e9 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -91,143 +91,143 @@ platforms: driver: image: saltimages/salt-master-py3:rockylinux-8 - ## SALT `3007.5` - - name: debian-12-3007-5 + ## SALT `3007.6` + - name: debian-12-3007-6 driver: - image: saltimages/salt-3007.5-py3:debian-12 + image: saltimages/salt-3007.6-py3:debian-12 run_command: /lib/systemd/systemd - - name: debian-11-3007-5 + - name: debian-11-3007-6 driver: - image: saltimages/salt-3007.5-py3:debian-11 + image: saltimages/salt-3007.6-py3:debian-11 run_command: /lib/systemd/systemd - - name: ubuntu-2404-3007-5 + - name: ubuntu-2404-3007-6 driver: - image: saltimages/salt-3007.5-py3:ubuntu-24.04 + image: saltimages/salt-3007.6-py3:ubuntu-24.04 run_command: /lib/systemd/systemd - - name: ubuntu-2204-3007-5 + - name: ubuntu-2204-3007-6 driver: - image: saltimages/salt-3007.5-py3:ubuntu-22.04 + image: saltimages/salt-3007.6-py3:ubuntu-22.04 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3007-5 + - name: ubuntu-2004-3007-6 driver: - image: saltimages/salt-3007.5-py3:ubuntu-20.04 + image: saltimages/salt-3007.6-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: centos-stream9-3007-5 + - name: centos-stream9-3007-6 driver: - image: saltimages/salt-3007.5-py3:centos-stream9 - - name: opensuse-leap-156-3007-5 + image: saltimages/salt-3007.6-py3:centos-stream9 + - name: opensuse-leap-156-3007-6 driver: - image: saltimages/salt-3007.5-py3:opensuse-leap-15.6 + image: saltimages/salt-3007.6-py3:opensuse-leap-15.6 # Workaround to avoid intermittent failures on `opensuse-leap-15.6`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-tmbl-latest-3007-5 + - name: opensuse-tmbl-latest-3007-6 driver: - image: saltimages/salt-3007.5-py3:opensuse-tumbleweed-latest + image: saltimages/salt-3007.6-py3:opensuse-tumbleweed-latest # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: fedora-41-3007-5 + - name: fedora-41-3007-6 driver: - image: saltimages/salt-3007.5-py3:fedora-41 - - name: fedora-40-3007-5 + image: saltimages/salt-3007.6-py3:fedora-41 + - name: fedora-40-3007-6 driver: - image: saltimages/salt-3007.5-py3:fedora-40 - - name: amazonlinux-2023-3007-5 + image: saltimages/salt-3007.6-py3:fedora-40 + - name: amazonlinux-2023-3007-6 driver: - image: saltimages/salt-3007.5-py3:amazonlinux-2023 - - name: amazonlinux-2-3007-5 + image: saltimages/salt-3007.6-py3:amazonlinux-2023 + - name: amazonlinux-2-3007-6 driver: - image: saltimages/salt-3007.5-py3:amazonlinux-2 - - name: oraclelinux-9-3007-5 + image: saltimages/salt-3007.6-py3:amazonlinux-2 + - name: oraclelinux-9-3007-6 driver: - image: saltimages/salt-3007.5-py3:oraclelinux-9 - - name: oraclelinux-8-3007-5 + image: saltimages/salt-3007.6-py3:oraclelinux-9 + - name: oraclelinux-8-3007-6 driver: - image: saltimages/salt-3007.5-py3:oraclelinux-8 - - name: almalinux-9-3007-5 + image: saltimages/salt-3007.6-py3:oraclelinux-8 + - name: almalinux-9-3007-6 driver: - image: saltimages/salt-3007.5-py3:almalinux-9 - - name: almalinux-8-3007-5 + image: saltimages/salt-3007.6-py3:almalinux-9 + - name: almalinux-8-3007-6 driver: - image: saltimages/salt-3007.5-py3:almalinux-8 - - name: rockylinux-9-3007-5 + image: saltimages/salt-3007.6-py3:almalinux-8 + - name: rockylinux-9-3007-6 driver: - image: saltimages/salt-3007.5-py3:rockylinux-9 - - name: rockylinux-8-3007-5 + image: saltimages/salt-3007.6-py3:rockylinux-9 + - name: rockylinux-8-3007-6 driver: - image: saltimages/salt-3007.5-py3:rockylinux-8 + image: saltimages/salt-3007.6-py3:rockylinux-8 - ## SALT `3006.13` - - name: debian-12-3006-13 + ## SALT `3006.14` + - name: debian-12-3006-14 driver: - image: saltimages/salt-3006.13-py3:debian-12 + image: saltimages/salt-3006.14-py3:debian-12 run_command: /lib/systemd/systemd - - name: debian-11-3006-13 + - name: debian-11-3006-14 driver: - image: saltimages/salt-3006.13-py3:debian-11 + image: saltimages/salt-3006.14-py3:debian-11 run_command: /lib/systemd/systemd - - name: ubuntu-2404-3006-13 + - name: ubuntu-2404-3006-14 driver: - image: saltimages/salt-3006.13-py3:ubuntu-24.04 + image: saltimages/salt-3006.14-py3:ubuntu-24.04 run_command: /lib/systemd/systemd - - name: ubuntu-2204-3006-13 + - name: ubuntu-2204-3006-14 driver: - image: saltimages/salt-3006.13-py3:ubuntu-22.04 + image: saltimages/salt-3006.14-py3:ubuntu-22.04 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3006-13 + - name: ubuntu-2004-3006-14 driver: - image: saltimages/salt-3006.13-py3:ubuntu-20.04 + image: saltimages/salt-3006.14-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: centos-stream9-3006-13 + - name: centos-stream9-3006-14 driver: - image: saltimages/salt-3006.13-py3:centos-stream9 - - name: opensuse-tmbl-latest-3006-13 + image: saltimages/salt-3006.14-py3:centos-stream9 + - name: opensuse-tmbl-latest-3006-14 driver: - image: saltimages/salt-3006.13-py3:opensuse-tumbleweed-latest + image: saltimages/salt-3006.14-py3:opensuse-tumbleweed-latest # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-leap-156-3006-13 + - name: opensuse-leap-156-3006-14 driver: - image: saltimages/salt-3006.13-py3:opensuse-leap-15.6 + image: saltimages/salt-3006.14-py3:opensuse-leap-15.6 # Workaround to avoid intermittent failures on `opensuse-leap-15.6`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: fedora-41-3006-13 + - name: fedora-41-3006-14 driver: - image: saltimages/salt-3006.13-py3:fedora-41 - - name: fedora-40-3006-13 + image: saltimages/salt-3006.14-py3:fedora-41 + - name: fedora-40-3006-14 driver: - image: saltimages/salt-3006.13-py3:fedora-40 - - name: amazonlinux-2023-3006-13 + image: saltimages/salt-3006.14-py3:fedora-40 + - name: amazonlinux-2023-3006-14 driver: - image: saltimages/salt-3006.13-py3:amazonlinux-2023 - - name: amazonlinux-2-3006-13 + image: saltimages/salt-3006.14-py3:amazonlinux-2023 + - name: amazonlinux-2-3006-14 driver: - image: saltimages/salt-3006.13-py3:amazonlinux-2 - - name: oraclelinux-9-3006-13 + image: saltimages/salt-3006.14-py3:amazonlinux-2 + - name: oraclelinux-9-3006-14 driver: - image: saltimages/salt-3006.13-py3:oraclelinux-9 - - name: oraclelinux-8-3006-13 + image: saltimages/salt-3006.14-py3:oraclelinux-9 + - name: oraclelinux-8-3006-14 driver: - image: saltimages/salt-3006.13-py3:oraclelinux-8 - - name: almalinux-9-3006-13 + image: saltimages/salt-3006.14-py3:oraclelinux-8 + - name: almalinux-9-3006-14 driver: - image: saltimages/salt-3006.13-py3:almalinux-9 - - name: almalinux-8-3006-13 + image: saltimages/salt-3006.14-py3:almalinux-9 + - name: almalinux-8-3006-14 driver: - image: saltimages/salt-3006.13-py3:almalinux-8 - - name: rockylinux-9-3006-13 + image: saltimages/salt-3006.14-py3:almalinux-8 + - name: rockylinux-9-3006-14 driver: - image: saltimages/salt-3006.13-py3:rockylinux-9 - - name: rockylinux-8-3006-13 + image: saltimages/salt-3006.14-py3:rockylinux-9 + - name: rockylinux-8-3006-14 driver: - image: saltimages/salt-3006.13-py3:rockylinux-8 + image: saltimages/salt-3006.14-py3:rockylinux-8 verifier: