Skip to content

ci: update images for v3006.17 & v3007.9 #392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 28, 2025
Merged

ci: update images for v3006.17 & v3007.9 #392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95bd35b
ci: update images for v3006.16 & v3007.8
dafyddj Sep 23, 2025
1fddc4c
ci: update images for v3006.17 & v3007.9
dafyddj Nov 25, 2025
167ceff
chore(gemfile+lock): switch to upstream `kitchen-docker`
dafyddj Nov 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ gem 'inspec', git: 'https://gitlab.com/saltstack-formulas/infrastructure/inspec'
# improvement: avoid package installations which are already covered by the
# `salt-image-builder` (i.e. the pre-salted images that we're using)
# rubocop:disable Layout/LineLength
gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf'
gem 'kitchen-docker', git: 'https://github.com/test-kitchen/kitchen-docker', ref: '511e4ad36856b9e2eccceb56603586e6cebd296a'
# rubocop:enable Layout/LineLength

gem 'kitchen-inspec', '3.0.0'
Expand Down
24 changes: 12 additions & 12 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
GIT
remote: https://github.com/test-kitchen/kitchen-docker
revision: 511e4ad36856b9e2eccceb56603586e6cebd296a
ref: 511e4ad36856b9e2eccceb56603586e6cebd296a
specs:
kitchen-docker (3.0.0)
test-kitchen (>= 1.0.0, < 4.0)

GIT
remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
revision: a0c6295303f7d7a4d2a6164b5e77868560b04945
Expand Down Expand Up @@ -40,14 +48,6 @@ GIT
tty-prompt (~> 0.17)
tty-table (~> 0.10)

GIT
remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker
revision: 104079a1d2fe34f5b076f4d316f6f837fa76e412
branch: ssf
specs:
kitchen-docker (2.13.0)
test-kitchen (>= 1.0.0)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -322,11 +322,11 @@ GEM
ms_rest_azure (~> 0.12.0)
azure_mgmt_storage (0.23.0)
ms_rest_azure (~> 0.12.0)
base64 (0.2.0)
base64 (0.3.0)
bcrypt_pbkdf (1.1.1)
bcrypt_pbkdf (1.1.1-x64-mingw-ucrt)
benchmark (0.4.0)
bigdecimal (3.1.9)
bigdecimal (3.3.1)
bson (4.15.0)
builder (3.3.0)
chef-config (18.7.6)
Expand Down Expand Up @@ -513,7 +513,7 @@ GEM
faraday (>= 0.9, < 2.0.0)
faraday-cookie_jar (~> 0.0.6)
ms_rest (~> 0.7.6)
multi_json (1.15.0)
multi_json (1.17.0)
multipart-post (2.4.1)
mutex_m (0.3.0)
net-scp (4.1.0)
Expand Down Expand Up @@ -556,7 +556,7 @@ GEM
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.4.2)
rexml (3.4.4)
roo (2.9.0)
nokogiri (~> 1)
rubyzip (>= 1.3.0, < 3.0.0)
Expand Down
148 changes: 74 additions & 74 deletions kitchen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,143 +91,143 @@ platforms:
driver:
image: saltimages/salt-master-py3:rockylinux-8

## SALT `3007.7`
- name: debian-12-3007-7
## SALT `3007.9`
- name: debian-12-3007-9
driver:
image: saltimages/salt-3007.7-py3:debian-12
image: saltimages/salt-3007.9-py3:debian-12
run_command: /lib/systemd/systemd
- name: debian-11-3007-7
- name: debian-11-3007-9
driver:
image: saltimages/salt-3007.7-py3:debian-11
image: saltimages/salt-3007.9-py3:debian-11
run_command: /lib/systemd/systemd
- name: ubuntu-2404-3007-7
- name: ubuntu-2404-3007-9
driver:
image: saltimages/salt-3007.7-py3:ubuntu-24.04
image: saltimages/salt-3007.9-py3:ubuntu-24.04
run_command: /lib/systemd/systemd
- name: ubuntu-2204-3007-7
- name: ubuntu-2204-3007-9
driver:
image: saltimages/salt-3007.7-py3:ubuntu-22.04
image: saltimages/salt-3007.9-py3:ubuntu-22.04
run_command: /lib/systemd/systemd
- name: ubuntu-2004-3007-7
- name: ubuntu-2004-3007-9
driver:
image: saltimages/salt-3007.7-py3:ubuntu-20.04
image: saltimages/salt-3007.9-py3:ubuntu-20.04
run_command: /lib/systemd/systemd
- name: centos-stream9-3007-7
- name: centos-stream9-3007-9
driver:
image: saltimages/salt-3007.7-py3:centos-stream9
- name: opensuse-leap-156-3007-7
image: saltimages/salt-3007.9-py3:centos-stream9
- name: opensuse-leap-156-3007-9
driver:
image: saltimages/salt-3007.7-py3:opensuse-leap-15.6
image: saltimages/salt-3007.9-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-7
- name: opensuse-tmbl-latest-3007-9
driver:
image: saltimages/salt-3007.7-py3:opensuse-tumbleweed-latest
image: saltimages/salt-3007.9-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-7
- name: fedora-41-3007-9
driver:
image: saltimages/salt-3007.7-py3:fedora-41
- name: fedora-40-3007-7
image: saltimages/salt-3007.9-py3:fedora-41
- name: fedora-40-3007-9
driver:
image: saltimages/salt-3007.7-py3:fedora-40
- name: amazonlinux-2023-3007-7
image: saltimages/salt-3007.9-py3:fedora-40
- name: amazonlinux-2023-3007-9
driver:
image: saltimages/salt-3007.7-py3:amazonlinux-2023
- name: amazonlinux-2-3007-7
image: saltimages/salt-3007.9-py3:amazonlinux-2023
- name: amazonlinux-2-3007-9
driver:
image: saltimages/salt-3007.7-py3:amazonlinux-2
- name: oraclelinux-9-3007-7
image: saltimages/salt-3007.9-py3:amazonlinux-2
- name: oraclelinux-9-3007-9
driver:
image: saltimages/salt-3007.7-py3:oraclelinux-9
- name: oraclelinux-8-3007-7
image: saltimages/salt-3007.9-py3:oraclelinux-9
- name: oraclelinux-8-3007-9
driver:
image: saltimages/salt-3007.7-py3:oraclelinux-8
- name: almalinux-9-3007-7
image: saltimages/salt-3007.9-py3:oraclelinux-8
- name: almalinux-9-3007-9
driver:
image: saltimages/salt-3007.7-py3:almalinux-9
- name: almalinux-8-3007-7
image: saltimages/salt-3007.9-py3:almalinux-9
- name: almalinux-8-3007-9
driver:
image: saltimages/salt-3007.7-py3:almalinux-8
- name: rockylinux-9-3007-7
image: saltimages/salt-3007.9-py3:almalinux-8
- name: rockylinux-9-3007-9
driver:
image: saltimages/salt-3007.7-py3:rockylinux-9
- name: rockylinux-8-3007-7
image: saltimages/salt-3007.9-py3:rockylinux-9
- name: rockylinux-8-3007-9
driver:
image: saltimages/salt-3007.7-py3:rockylinux-8
image: saltimages/salt-3007.9-py3:rockylinux-8

## SALT `3006.15`
- name: debian-12-3006-15
## SALT `3006.17`
- name: debian-12-3006-17
driver:
image: saltimages/salt-3006.15-py3:debian-12
image: saltimages/salt-3006.17-py3:debian-12
run_command: /lib/systemd/systemd
- name: debian-11-3006-15
- name: debian-11-3006-17
driver:
image: saltimages/salt-3006.15-py3:debian-11
image: saltimages/salt-3006.17-py3:debian-11
run_command: /lib/systemd/systemd
- name: ubuntu-2404-3006-15
- name: ubuntu-2404-3006-17
driver:
image: saltimages/salt-3006.15-py3:ubuntu-24.04
image: saltimages/salt-3006.17-py3:ubuntu-24.04
run_command: /lib/systemd/systemd
- name: ubuntu-2204-3006-15
- name: ubuntu-2204-3006-17
driver:
image: saltimages/salt-3006.15-py3:ubuntu-22.04
image: saltimages/salt-3006.17-py3:ubuntu-22.04
run_command: /lib/systemd/systemd
- name: ubuntu-2004-3006-15
- name: ubuntu-2004-3006-17
driver:
image: saltimages/salt-3006.15-py3:ubuntu-20.04
image: saltimages/salt-3006.17-py3:ubuntu-20.04
run_command: /lib/systemd/systemd
- name: centos-stream9-3006-15
- name: centos-stream9-3006-17
driver:
image: saltimages/salt-3006.15-py3:centos-stream9
- name: opensuse-tmbl-latest-3006-15
image: saltimages/salt-3006.17-py3:centos-stream9
- name: opensuse-tmbl-latest-3006-17
driver:
image: saltimages/salt-3006.15-py3:opensuse-tumbleweed-latest
image: saltimages/salt-3006.17-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-15
- name: opensuse-leap-156-3006-17
driver:
image: saltimages/salt-3006.15-py3:opensuse-leap-15.6
image: saltimages/salt-3006.17-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-15
- name: fedora-41-3006-17
driver:
image: saltimages/salt-3006.15-py3:fedora-41
- name: fedora-40-3006-15
image: saltimages/salt-3006.17-py3:fedora-41
- name: fedora-40-3006-17
driver:
image: saltimages/salt-3006.15-py3:fedora-40
- name: amazonlinux-2023-3006-15
image: saltimages/salt-3006.17-py3:fedora-40
- name: amazonlinux-2023-3006-17
driver:
image: saltimages/salt-3006.15-py3:amazonlinux-2023
- name: amazonlinux-2-3006-15
image: saltimages/salt-3006.17-py3:amazonlinux-2023
- name: amazonlinux-2-3006-17
driver:
image: saltimages/salt-3006.15-py3:amazonlinux-2
- name: oraclelinux-9-3006-15
image: saltimages/salt-3006.17-py3:amazonlinux-2
- name: oraclelinux-9-3006-17
driver:
image: saltimages/salt-3006.15-py3:oraclelinux-9
- name: oraclelinux-8-3006-15
image: saltimages/salt-3006.17-py3:oraclelinux-9
- name: oraclelinux-8-3006-17
driver:
image: saltimages/salt-3006.15-py3:oraclelinux-8
- name: almalinux-9-3006-15
image: saltimages/salt-3006.17-py3:oraclelinux-8
- name: almalinux-9-3006-17
driver:
image: saltimages/salt-3006.15-py3:almalinux-9
- name: almalinux-8-3006-15
image: saltimages/salt-3006.17-py3:almalinux-9
- name: almalinux-8-3006-17
driver:
image: saltimages/salt-3006.15-py3:almalinux-8
- name: rockylinux-9-3006-15
image: saltimages/salt-3006.17-py3:almalinux-8
- name: rockylinux-9-3006-17
driver:
image: saltimages/salt-3006.15-py3:rockylinux-9
- name: rockylinux-8-3006-15
image: saltimages/salt-3006.17-py3:rockylinux-9
- name: rockylinux-8-3006-17
driver:
image: saltimages/salt-3006.15-py3:rockylinux-8
image: saltimages/salt-3006.17-py3:rockylinux-8


verifier:
Expand Down
Loading