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

ci(kitchen+gitlab-ci): use latest pre-salted images [skip ci] 

* Automated using https://github.com/myii/ssf-formula/pull/293
This commit is contained in:
Imran Iqbal 2021-02-14 07:44:21 +00:00
parent f00d7ad348
commit fb9901e3ac
No known key found for this signature in database
GPG Key ID: 6D8629439D2B7819
6 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci.yml
View File

@ -137,6 +137,7 @@ v3002-py3-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
v3002-py3-amazonlinux-2-3002-2-py3: {extends: '.test_instance'} v3002-py3-amazonlinux-2-3002-2-py3: {extends: '.test_instance'}
v3002-py3-oraclelinux-8-3002-2-py3: {extends: '.test_instance'} v3002-py3-oraclelinux-8-3002-2-py3: {extends: '.test_instance'}
v3002-py3-oraclelinux-7-3002-2-py3: {extends: '.test_instance'} v3002-py3-oraclelinux-7-3002-2-py3: {extends: '.test_instance'}
# v3002-py3-arch-base-latest-3002-2-py3: {extends: '.test_instance'}
v3002-py3-gentoo-stage3-latest-3002-2-py3: {extends: '.test_instance'} v3002-py3-gentoo-stage3-latest-3002-2-py3: {extends: '.test_instance'}
v3002-py3-gentoo-stage3-systemd-3002-2-py3: {extends: '.test_instance'} v3002-py3-gentoo-stage3-systemd-3002-2-py3: {extends: '.test_instance'}
v3001-py3-debian-10-3001-4-py3: {extends: '.test_instance'} v3001-py3-debian-10-3001-4-py3: {extends: '.test_instance'}
@ -153,6 +154,7 @@ v3001-py3-fedora-32-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-amazonlinux-2-3001-4-py3: {extends: '.test_instance'} # v3001-py3-amazonlinux-2-3001-4-py3: {extends: '.test_instance'}
v3001-py3-oraclelinux-8-3001-4-py3: {extends: '.test_instance'} v3001-py3-oraclelinux-8-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-oraclelinux-7-3001-4-py3: {extends: '.test_instance'} # v3001-py3-oraclelinux-7-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-arch-base-latest-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-gentoo-stage3-latest-3001-4-py3: {extends: '.test_instance'} # v3001-py3-gentoo-stage3-latest-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-gentoo-stage3-systemd-3001-4-py3: {extends: '.test_instance'} # v3001-py3-gentoo-stage3-systemd-3001-4-py3: {extends: '.test_instance'}
# v3000-py3-debian-10-3000-6-py3: {extends: '.test_instance'} # v3000-py3-debian-10-3000-6-py3: {extends: '.test_instance'}
@ -169,6 +171,7 @@ v3000-py3-oraclelinux-7-3000-6-py3: {extends: '.test_instance'}
# v3000-py3-gentoo-stage3-systemd-3000-6-py3: {extends: '.test_instance'} # v3000-py3-gentoo-stage3-systemd-3000-6-py3: {extends: '.test_instance'}
# v3000-py2-ubuntu-1804-3000-6-py2: {extends: '.test_instance'} # v3000-py2-ubuntu-1804-3000-6-py2: {extends: '.test_instance'}
v3000-py2-ubuntu-1604-3000-6-py2: {extends: '.test_instance'} v3000-py2-ubuntu-1604-3000-6-py2: {extends: '.test_instance'}
# v3000-py2-arch-base-latest-3000-6-py2: {extends: '.test_instance'}
############################################################################### ###############################################################################
# `release` stage: `semantic-release` # `release` stage: `semantic-release`

3
.travis.yml
View File

@ -97,6 +97,7 @@ jobs:
- env: INSTANCE=v3002-py3-amazonlinux-2-3002-2-py3 - env: INSTANCE=v3002-py3-amazonlinux-2-3002-2-py3
- env: INSTANCE=v3002-py3-oraclelinux-8-3002-2-py3 - env: INSTANCE=v3002-py3-oraclelinux-8-3002-2-py3
- env: INSTANCE=v3002-py3-oraclelinux-7-3002-2-py3 - env: INSTANCE=v3002-py3-oraclelinux-7-3002-2-py3
# - env: INSTANCE=v3002-py3-arch-base-latest-3002-2-py3
- env: INSTANCE=v3002-py3-gentoo-stage3-latest-3002-2-py3 - env: INSTANCE=v3002-py3-gentoo-stage3-latest-3002-2-py3
- env: INSTANCE=v3002-py3-gentoo-stage3-systemd-3002-2-py3 - env: INSTANCE=v3002-py3-gentoo-stage3-systemd-3002-2-py3
- env: INSTANCE=v3001-py3-debian-10-3001-4-py3 - env: INSTANCE=v3001-py3-debian-10-3001-4-py3
@ -113,6 +114,7 @@ jobs:
# - env: INSTANCE=v3001-py3-amazonlinux-2-3001-4-py3 # - env: INSTANCE=v3001-py3-amazonlinux-2-3001-4-py3
- env: INSTANCE=v3001-py3-oraclelinux-8-3001-4-py3 - env: INSTANCE=v3001-py3-oraclelinux-8-3001-4-py3
# - env: INSTANCE=v3001-py3-oraclelinux-7-3001-4-py3 # - env: INSTANCE=v3001-py3-oraclelinux-7-3001-4-py3
# - env: INSTANCE=v3001-py3-arch-base-latest-3001-4-py3
# - env: INSTANCE=v3001-py3-gentoo-stage3-latest-3001-4-py3 # - env: INSTANCE=v3001-py3-gentoo-stage3-latest-3001-4-py3
# - env: INSTANCE=v3001-py3-gentoo-stage3-systemd-3001-4-py3 # - env: INSTANCE=v3001-py3-gentoo-stage3-systemd-3001-4-py3
# - env: INSTANCE=v3000-py3-debian-10-3000-6-py3 # - env: INSTANCE=v3000-py3-debian-10-3000-6-py3
@ -129,6 +131,7 @@ jobs:
# - env: INSTANCE=v3000-py3-gentoo-stage3-systemd-3000-6-py3 # - env: INSTANCE=v3000-py3-gentoo-stage3-systemd-3000-6-py3
# - env: INSTANCE=v3000-py2-ubuntu-1804-3000-6-py2 # - env: INSTANCE=v3000-py2-ubuntu-1804-3000-6-py2
- env: INSTANCE=v3000-py2-ubuntu-1604-3000-6-py2 - env: INSTANCE=v3000-py2-ubuntu-1604-3000-6-py2
# - env: INSTANCE=v3000-py2-arch-base-latest-3000-6-py2
## Define the release stage that runs `semantic-release` ## Define the release stage that runs `semantic-release`
- stage: 'release' - stage: 'release'

8
kitchen.yml
View File

@ -8,8 +8,6 @@ driver:
privileged: true privileged: true
run_command: /lib/systemd/systemd run_command: /lib/systemd/systemd
# Make sure the platforms listed below match up with
# the `env.matrix` instances defined in `.travis.yml`
platforms: platforms:
## SALT `tiamat` ## SALT `tiamat`
- name: debian-10-tiamat-py3 - name: debian-10-tiamat-py3
@ -93,6 +91,9 @@ platforms:
- name: oraclelinux-8-master-py3 - name: oraclelinux-8-master-py3
driver: driver:
image: saltimages/salt-master-py3:oraclelinux-8 image: saltimages/salt-master-py3:oraclelinux-8
- name: oraclelinux-7-master-py3
driver:
image: saltimages/salt-master-py3:oraclelinux-7
- name: gentoo-stage3-latest-master-py3 - name: gentoo-stage3-latest-master-py3
driver: driver:
image: saltimages/salt-master-py3:gentoo-stage3-latest image: saltimages/salt-master-py3:gentoo-stage3-latest
@ -320,6 +321,7 @@ suites:
- amazonlinux-2-3002-2-py3 - amazonlinux-2-3002-2-py3
- oraclelinux-8-3002-2-py3 - oraclelinux-8-3002-2-py3
- oraclelinux-7-3002-2-py3 - oraclelinux-7-3002-2-py3
- arch-base-latest-3002-2-py3
- gentoo-stage3-latest-3002-2-py3 - gentoo-stage3-latest-3002-2-py3
- gentoo-stage3-systemd-3002-2-py3 - gentoo-stage3-systemd-3002-2-py3
provisioner: provisioner:
@ -358,6 +360,7 @@ suites:
- amazonlinux-2-3001-4-py3 - amazonlinux-2-3001-4-py3
- oraclelinux-8-3001-4-py3 - oraclelinux-8-3001-4-py3
- oraclelinux-7-3001-4-py3 - oraclelinux-7-3001-4-py3
- arch-base-latest-3001-4-py3
- gentoo-stage3-latest-3001-4-py3 - gentoo-stage3-latest-3001-4-py3
- gentoo-stage3-systemd-3001-4-py3 - gentoo-stage3-systemd-3001-4-py3
provisioner: provisioner:
@ -418,6 +421,7 @@ suites:
includes: includes:
- ubuntu-1804-3000-6-py2 - ubuntu-1804-3000-6-py2
- ubuntu-1604-3000-6-py2 - ubuntu-1604-3000-6-py2
- arch-base-latest-3000-6-py2
provisioner: provisioner:
state_top: state_top:
base: base:

1
test/integration/v3000-py2/inspec.yml
View File

@ -21,3 +21,4 @@ supports:
- platform-name: oracle - platform-name: oracle
- platform-name: arch - platform-name: arch
- platform-name: gentoo - platform-name: gentoo
- platform: windows

1
test/integration/v3001-py3/inspec.yml
View File

@ -21,3 +21,4 @@ supports:
- platform-name: oracle - platform-name: oracle
- platform-name: arch - platform-name: arch
- platform-name: gentoo - platform-name: gentoo
- platform: windows

1
test/integration/v3002-py3/inspec.yml
View File

@ -21,3 +21,4 @@ supports:
- platform-name: oracle - platform-name: oracle
- platform-name: arch - platform-name: arch
- platform-name: gentoo - platform-name: gentoo
- platform: windows