From 579a43b7a9c80ccb3bad179c61ee2af50ac139bb Mon Sep 17 00:00:00 2001 From: Jeff Neel <10672501+jeff350@users.noreply.github.com> Date: Tue, 25 Mar 2025 09:25:30 -0500 Subject: [PATCH] ci: use latest test images --- .gitlab-ci.yml | 5 ++++ kitchen.yml | 78 +++++++++++++++++++++++++------------------------- 2 files changed, 44 insertions(+), 39 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d7c753c..2f056e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -175,6 +175,11 @@ rubocop: test-formula-conversion: {extends: '.test_conversion'} # REMOVEME> # yamllint disable rule:line-length +# Fedora 41+ will permit failure until this PR is merged into kitchen-docker +# https://github.com/test-kitchen/kitchen-docker/pull/427 is merged +# OpenSUSE master branch will fail until zypperpkg module is back in salt core +# https://github.com/saltstack/great-module-migration/issues/14 +# default-debian-12-master-py3: {extends: '.test_instance'} default-debian-11-master-py3: {extends: '.test_instance'} default-ubuntu-2404-master-py3: {extends: '.test_instance'} diff --git a/kitchen.yml b/kitchen.yml index a21abfa..ecfb0ca 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -170,81 +170,81 @@ platforms: driver: image: saltimages/salt-3007.1-py3:rockylinux-8 - ## SALT `3006.9` - - name: debian-12-3006-9-py3 + ## SALT `3006.10` + - name: debian-12-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:debian-12 + image: saltimages/salt-3006.10-py3:debian-12 run_command: /lib/systemd/systemd - - name: debian-11-3006-9-py3 + - name: debian-11-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:debian-11 + image: saltimages/salt-3006.10-py3:debian-11 run_command: /lib/systemd/systemd - - name: ubuntu-2404-3006-9-py3 + - name: ubuntu-2404-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:ubuntu-24.04 + image: saltimages/salt-3006.10-py3:ubuntu-24.04 run_command: /lib/systemd/systemd - - name: ubuntu-2204-3006-9-py3 + - name: ubuntu-2204-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:ubuntu-22.04 + image: saltimages/salt-3006.10-py3:ubuntu-22.04 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3006-9-py3 + - name: ubuntu-2004-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:ubuntu-20.04 + image: saltimages/salt-3006.10-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: centos-stream9-3006-9-py3 + - name: centos-stream9-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:centos-stream9 - - name: opensuse-tmbl-latest-3006-9-py3 + image: saltimages/salt-3006.10-py3:centos-stream9 + - name: opensuse-tmbl-latest-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:opensuse-tumbleweed-latest + image: saltimages/salt-3006.10-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-9-py3 + - name: opensuse-leap-156-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:opensuse-leap-15.6 + image: saltimages/salt-3006.10-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-leap-155-3006-9-py3 + - name: opensuse-leap-155-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:opensuse-leap-15.5 + image: saltimages/salt-3006.10-py3:opensuse-leap-15.5 # Workaround to avoid intermittent failures on `opensuse-leap-15.5`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: fedora-41-3006-9-py3 + - name: fedora-41-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:fedora-41 - - name: fedora-40-3006-9-py3 + image: saltimages/salt-3006.10-py3:fedora-41 + - name: fedora-40-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:fedora-40 - - name: amazonlinux-2023-3006-9-py3 + image: saltimages/salt-3006.10-py3:fedora-40 + - name: amazonlinux-2023-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:amazonlinux-2023 - - name: amazonlinux-2-3006-9-py3 + image: saltimages/salt-3006.10-py3:amazonlinux-2023 + - name: amazonlinux-2-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:amazonlinux-2 - - name: oraclelinux-9-3006-9-py3 + image: saltimages/salt-3006.10-py3:amazonlinux-2 + - name: oraclelinux-9-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:oraclelinux-9 - - name: oraclelinux-8-3006-9-py3 + image: saltimages/salt-3006.10-py3:oraclelinux-9 + - name: oraclelinux-8-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:oraclelinux-8 - - name: almalinux-9-3006-9-py3 + image: saltimages/salt-3006.10-py3:oraclelinux-8 + - name: almalinux-9-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:almalinux-9 - - name: almalinux-8-3006-9-py3 + image: saltimages/salt-3006.10-py3:almalinux-9 + - name: almalinux-8-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:almalinux-8 - - name: rockylinux-9-3006-9-py3 + image: saltimages/salt-3006.10-py3:almalinux-8 + - name: rockylinux-9-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:rockylinux-9 - - name: rockylinux-8-3006-9-py3 + image: saltimages/salt-3006.10-py3:rockylinux-9 + - name: rockylinux-8-3006-10-py3 driver: - image: saltimages/salt-3006.9-py3:rockylinux-8 + image: saltimages/salt-3006.10-py3:rockylinux-8 verifier: