Salt
/
salt-formula
mirror of https://github.com/saltstack-formulas/salt-formula.git
0
0
Fork 0
Code Issues Activity

ci(kitchen+ci): update with latest `3003.2` pre-salted images [skip ci] 

* Automated using https://github.com/myii/ssf-formula/pull/360
This commit is contained in:
Imran Iqbal 2021-08-19 10:14:50 +01:00
parent 42d64870e3
commit 86b0fa1d40
No known key found for this signature in database
GPG Key ID: 6D8629439D2B7819
3 changed files with 103 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
.gitlab-ci.yml
View File

@ -130,21 +130,25 @@ rubocop:
## Define the rest of the matrix based on Kitchen testing ## Define the rest of the matrix based on Kitchen testing
# Make sure the instances listed below match up with # Make sure the instances listed below match up with
# the `platforms` defined in `kitchen.yml` # the `platforms` defined in `kitchen.yml`
v3003-py3-debian-11-3003-1-py3: {extends: '.test_instance_failure_permitted'} v3003-py3-debian-11-3003-2-py3: {extends: '.test_instance_failure_permitted'}
# v3003-py3-debian-10-3003-1-py3: {extends: '.test_instance'} # v3003-py3-debian-10-3003-2-py3: {extends: '.test_instance'}
# v3003-py3-debian-9-3003-1-py3: {extends: '.test_instance'} # v3003-py3-debian-9-3003-2-py3: {extends: '.test_instance'}
v3003-py3-ubuntu-2004-3003-1-py3: {extends: '.test_instance'} v3003-py3-ubuntu-2004-3003-2-py3: {extends: '.test_instance'}
# v3003-py3-ubuntu-1804-3003-1-py3: {extends: '.test_instance'} # v3003-py3-ubuntu-1804-3003-2-py3: {extends: '.test_instance'}
v3003-py3-centos-8-3003-1-py3: {extends: '.test_instance'} v3003-py3-centos-8-3003-2-py3: {extends: '.test_instance'}
# v3003-py3-centos-7-3003-1-py3: {extends: '.test_instance'} # v3003-py3-centos-7-3003-2-py3: {extends: '.test_instance'}
v3003-py3-fedora-34-3003-1-py3: {extends: '.test_instance'} v3003-py3-fedora-34-3003-2-py3: {extends: '.test_instance'}
v3003-py3-fedora-33-3003-1-py3: {extends: '.test_instance'} v3003-py3-fedora-33-3003-2-py3: {extends: '.test_instance'}
# v3003-py3-opensuse-leap-153-3003-1-py3: {extends: '.test_instance'} # v3003-py3-opensuse-leap-153-3003-2-py3: {extends: '.test_instance'}
# v3003-py3-opensuse-leap-152-3003-1-py3: {extends: '.test_instance'} # v3003-py3-opensuse-leap-152-3003-2-py3: {extends: '.test_instance'}
# v3003-py3-opensuse-tmbl-latest-3003-1-py3: {extends: '.test_instance'} # v3003-py3-opensuse-tmbl-latest-3003-2-py3: {extends: '.test_instance'}
v3003-py3-amazonlinux-2-3003-1-py3: {extends: '.test_instance'} v3003-py3-amazonlinux-2-3003-2-py3: {extends: '.test_instance'}
v3003-py3-oraclelinux-8-3003-1-py3: {extends: '.test_instance'} v3003-py3-oraclelinux-8-3003-2-py3: {extends: '.test_instance'}
# v3003-py3-oraclelinux-7-3003-1-py3: {extends: '.test_instance'} # v3003-py3-oraclelinux-7-3003-2-py3: {extends: '.test_instance'}
# v3003-py3-arch-base-latest-3003-2-py3: {extends: '.test_instance'}
# v3003-py3-gentoo-stage3-latest-3003-2-py3: {extends: '.test_instance'}
# v3003-py3-gentoo-stage3-systemd-3003-2-py3: {extends: '.test_instance'}
v3003-py3-almalinux-8-3003-2-py3: {extends: '.test_instance'}
v3003-py3-arch-base-latest-3003-1-py3: {extends: '.test_instance'} v3003-py3-arch-base-latest-3003-1-py3: {extends: '.test_instance'}
v3003-py3-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'} v3003-py3-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'}
v3003-py3-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'} v3003-py3-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'}

34
.travis.yml
View File

@ -83,21 +83,25 @@ jobs:
## Define the rest of the matrix based on Kitchen testing ## Define the rest of the matrix based on Kitchen testing
# Make sure the instances listed below match up with # Make sure the instances listed below match up with
# the `platforms` defined in `kitchen.yml` # the `platforms` defined in `kitchen.yml`
- env: INSTANCE=v3003-py3-debian-11-3003-1-py3 - env: INSTANCE=v3003-py3-debian-11-3003-2-py3
# - env: INSTANCE=v3003-py3-debian-10-3003-1-py3 # - env: INSTANCE=v3003-py3-debian-10-3003-2-py3
# - env: INSTANCE=v3003-py3-debian-9-3003-1-py3 # - env: INSTANCE=v3003-py3-debian-9-3003-2-py3
- env: INSTANCE=v3003-py3-ubuntu-2004-3003-1-py3 - env: INSTANCE=v3003-py3-ubuntu-2004-3003-2-py3
# - env: INSTANCE=v3003-py3-ubuntu-1804-3003-1-py3 # - env: INSTANCE=v3003-py3-ubuntu-1804-3003-2-py3
- env: INSTANCE=v3003-py3-centos-8-3003-1-py3 - env: INSTANCE=v3003-py3-centos-8-3003-2-py3
# - env: INSTANCE=v3003-py3-centos-7-3003-1-py3 # - env: INSTANCE=v3003-py3-centos-7-3003-2-py3
- env: INSTANCE=v3003-py3-fedora-34-3003-1-py3 - env: INSTANCE=v3003-py3-fedora-34-3003-2-py3
- env: INSTANCE=v3003-py3-fedora-33-3003-1-py3 - env: INSTANCE=v3003-py3-fedora-33-3003-2-py3
# - env: INSTANCE=v3003-py3-opensuse-leap-153-3003-1-py3 # - env: INSTANCE=v3003-py3-opensuse-leap-153-3003-2-py3
# - env: INSTANCE=v3003-py3-opensuse-leap-152-3003-1-py3 # - env: INSTANCE=v3003-py3-opensuse-leap-152-3003-2-py3
# - env: INSTANCE=v3003-py3-opensuse-tmbl-latest-3003-1-py3 # - env: INSTANCE=v3003-py3-opensuse-tmbl-latest-3003-2-py3
- env: INSTANCE=v3003-py3-amazonlinux-2-3003-1-py3 - env: INSTANCE=v3003-py3-amazonlinux-2-3003-2-py3
- env: INSTANCE=v3003-py3-oraclelinux-8-3003-1-py3 - env: INSTANCE=v3003-py3-oraclelinux-8-3003-2-py3
# - env: INSTANCE=v3003-py3-oraclelinux-7-3003-1-py3 # - env: INSTANCE=v3003-py3-oraclelinux-7-3003-2-py3
# - env: INSTANCE=v3003-py3-arch-base-latest-3003-2-py3
# - env: INSTANCE=v3003-py3-gentoo-stage3-latest-3003-2-py3
# - env: INSTANCE=v3003-py3-gentoo-stage3-systemd-3003-2-py3
- env: INSTANCE=v3003-py3-almalinux-8-3003-2-py3
- env: INSTANCE=v3003-py3-arch-base-latest-3003-1-py3 - env: INSTANCE=v3003-py3-arch-base-latest-3003-1-py3
- env: INSTANCE=v3003-py3-gentoo-stage3-latest-3003-1-py3 - env: INSTANCE=v3003-py3-gentoo-stage3-latest-3003-1-py3
- env: INSTANCE=v3003-py3-gentoo-stage3-systemd-3003-1-py3 - env: INSTANCE=v3003-py3-gentoo-stage3-systemd-3003-1-py3

111
kitchen.yml
View File

@ -142,69 +142,84 @@ platforms:
driver: driver:
image: saltimages/salt-master-py3:rockylinux-8 image: saltimages/salt-master-py3:rockylinux-8
## SALT `3003.1` ## SALT `3003.2`
- name: debian-11-3003-1-py3 - name: debian-11-3003-2-py3
driver: driver:
image: saltimages/salt-3003.1-py3:debian-11 image: saltimages/salt-3003.2-py3:debian-11
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: debian-10-3003-1-py3 - name: debian-10-3003-2-py3
driver: driver:
image: saltimages/salt-3003.1-py3:debian-10 image: saltimages/salt-3003.2-py3:debian-10
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: debian-9-3003-1-py3 - name: debian-9-3003-2-py3
driver: driver:
image: saltimages/salt-3003.1-py3:debian-9 image: saltimages/salt-3003.2-py3:debian-9
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: ubuntu-2004-3003-1-py3 - name: ubuntu-2004-3003-2-py3
driver: driver:
image: saltimages/salt-3003.1-py3:ubuntu-20.04 image: saltimages/salt-3003.2-py3:ubuntu-20.04
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: ubuntu-1804-3003-1-py3 - name: ubuntu-1804-3003-2-py3
driver: driver:
image: saltimages/salt-3003.1-py3:ubuntu-18.04 image: saltimages/salt-3003.2-py3:ubuntu-18.04
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
- name: centos-8-3003-1-py3 - name: centos-8-3003-2-py3
driver: driver:
image: saltimages/salt-3003.1-py3:centos-8 image: saltimages/salt-3003.2-py3:centos-8
- name: centos-7-3003-1-py3 - name: centos-7-3003-2-py3
driver: driver:
image: saltimages/salt-3003.1-py3:centos-7 image: saltimages/salt-3003.2-py3:centos-7
- name: fedora-34-3003-1-py3 - name: fedora-34-3003-2-py3
driver: driver:
image: saltimages/salt-3003.1-py3:fedora-34 image: saltimages/salt-3003.2-py3:fedora-34
- name: fedora-33-3003-1-py3 - name: fedora-33-3003-2-py3
driver: driver:
image: saltimages/salt-3003.1-py3:fedora-33 image: saltimages/salt-3003.2-py3:fedora-33
- name: opensuse-leap-153-3003-1-py3 - name: opensuse-leap-153-3003-2-py3
driver: driver:
image: saltimages/salt-3003.1-py3:opensuse-leap-15.3 image: saltimages/salt-3003.2-py3:opensuse-leap-15.3
# Workaround to avoid intermittent failures on `opensuse-leap-15.3`: # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
# => SCP did not finish successfully (255): (Net::SCP::Error) # => SCP did not finish successfully (255): (Net::SCP::Error)
transport: transport:
max_ssh_sessions: 1 max_ssh_sessions: 1
- name: opensuse-leap-152-3003-1-py3 - name: opensuse-leap-152-3003-2-py3
driver: driver:
image: saltimages/salt-3003.1-py3:opensuse-leap-15.2 image: saltimages/salt-3003.2-py3:opensuse-leap-15.2
# Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
# => SCP did not finish successfully (255): (Net::SCP::Error) # => SCP did not finish successfully (255): (Net::SCP::Error)
transport: transport:
max_ssh_sessions: 1 max_ssh_sessions: 1
- name: opensuse-tmbl-latest-3003-1-py3 - name: opensuse-tmbl-latest-3003-2-py3
driver: driver:
image: saltimages/salt-3003.1-py3:opensuse-tumbleweed-latest image: saltimages/salt-3003.2-py3:opensuse-tumbleweed-latest
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
# => SCP did not finish successfully (255): (Net::SCP::Error) # => SCP did not finish successfully (255): (Net::SCP::Error)
transport: transport:
max_ssh_sessions: 1 max_ssh_sessions: 1
- name: amazonlinux-2-3003-1-py3 - name: amazonlinux-2-3003-2-py3
driver: driver:
image: saltimages/salt-3003.1-py3:amazonlinux-2 image: saltimages/salt-3003.2-py3:amazonlinux-2
- name: oraclelinux-8-3003-1-py3 - name: oraclelinux-8-3003-2-py3
driver: driver:
image: saltimages/salt-3003.1-py3:oraclelinux-8 image: saltimages/salt-3003.2-py3:oraclelinux-8
- name: oraclelinux-7-3003-1-py3 - name: oraclelinux-7-3003-2-py3
driver: driver:
image: saltimages/salt-3003.1-py3:oraclelinux-7 image: saltimages/salt-3003.2-py3:oraclelinux-7
- name: arch-base-latest-3003-2-py3
driver:
image: saltimages/salt-3003.2-py3:arch-base-latest
- name: gentoo-stage3-latest-3003-2-py3
driver:
image: saltimages/salt-3003.2-py3:gentoo-stage3-latest
run_command: /sbin/init
- name: gentoo-stage3-systemd-3003-2-py3
driver:
image: saltimages/salt-3003.2-py3:gentoo-stage3-systemd
- name: almalinux-8-3003-2-py3
driver:
image: saltimages/salt-3003.2-py3:almalinux-8
## SALT `3003.1`
- name: arch-base-latest-3003-1-py3 - name: arch-base-latest-3003-1-py3
driver: driver:
image: saltimages/salt-3003.1-py3:arch-base-latest image: saltimages/salt-3003.1-py3:arch-base-latest
@ -430,21 +445,25 @@ verifier:
suites: suites:
- name: v3003-py3 - name: v3003-py3
includes: includes:
- debian-11-3003-1-py3 - debian-11-3003-2-py3
- debian-10-3003-1-py3 - debian-10-3003-2-py3
- debian-9-3003-1-py3 - debian-9-3003-2-py3
- ubuntu-2004-3003-1-py3 - ubuntu-2004-3003-2-py3
- ubuntu-1804-3003-1-py3 - ubuntu-1804-3003-2-py3
- centos-8-3003-1-py3 - centos-8-3003-2-py3
- centos-7-3003-1-py3 - centos-7-3003-2-py3
- fedora-34-3003-1-py3 - fedora-34-3003-2-py3
- fedora-33-3003-1-py3 - fedora-33-3003-2-py3
- opensuse-leap-153-3003-1-py3 - opensuse-leap-153-3003-2-py3
- opensuse-leap-152-3003-1-py3 - opensuse-leap-152-3003-2-py3
- opensuse-tmbl-latest-3003-1-py3 - opensuse-tmbl-latest-3003-2-py3
- amazonlinux-2-3003-1-py3 - amazonlinux-2-3003-2-py3
- oraclelinux-8-3003-1-py3 - oraclelinux-8-3003-2-py3
- oraclelinux-7-3003-1-py3 - oraclelinux-7-3003-2-py3
- arch-base-latest-3003-2-py3
- gentoo-stage3-latest-3003-2-py3
- gentoo-stage3-systemd-3003-2-py3
- almalinux-8-3003-2-py3
- arch-base-latest-3003-1-py3 - arch-base-latest-3003-1-py3
- gentoo-stage3-latest-3003-1-py3 - gentoo-stage3-latest-3003-1-py3
- gentoo-stage3-systemd-3003-1-py3 - gentoo-stage3-systemd-3003-1-py3