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

ci(kitchen+travis): adjust matrix to add `3000.3` [skip ci] 

* Semi-automated using https://github.com/myii/ssf-formula/pull/183
This commit is contained in:
Imran Iqbal 2020-05-14 07:13:33 +01:00
parent 5917569464
commit a3338018fb
No known key found for this signature in database
GPG Key ID: 6D8629439D2B7819
2 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.travis.yml
View File

@ -58,16 +58,16 @@ jobs:
## Define the rest of the matrix based on Kitchen testing
# Make sure the instances listed below match up with
# the `platforms` defined in `kitchen.yml`
- env: INSTANCE=v3000-py3-debian-10-3000-2-py3
# - env: INSTANCE=v3000-py3-debian-9-3000-2-py3
# - env: INSTANCE=v3000-py3-ubuntu-1804-3000-2-py3
- env: INSTANCE=v3000-py3-centos-8-3000-2-py3
# - env: INSTANCE=v3000-py3-centos-7-3000-2-py3
- env: INSTANCE=v3000-py3-fedora-31-3000-2-py3
# - env: INSTANCE=v3000-py3-opensuse-leap-151-3000-2-py3
- env: INSTANCE=v3000-py3-amazonlinux-2-3000-2-py3
- env: INSTANCE=v3000-py2-ubuntu-1804-3000-2-py2
# - env: INSTANCE=v3000-py2-ubuntu-1604-3000-2-py2
- env: INSTANCE=v3000-py3-debian-10-3000-3-py3
# - env: INSTANCE=v3000-py3-debian-9-3000-3-py3
# - env: INSTANCE=v3000-py3-ubuntu-1804-3000-3-py3
- env: INSTANCE=v3000-py3-centos-8-3000-3-py3
# - env: INSTANCE=v3000-py3-centos-7-3000-3-py3
- env: INSTANCE=v3000-py3-fedora-31-3000-3-py3
# - env: INSTANCE=v3000-py3-opensuse-leap-151-3000-3-py3
- env: INSTANCE=v3000-py3-amazonlinux-2-3000-3-py3
- env: INSTANCE=v3000-py2-ubuntu-1804-3000-3-py2
# - env: INSTANCE=v3000-py2-ubuntu-1604-3000-3-py2
# - env: INSTANCE=v201902-py3-debian-10-2019-2-py3
- env: INSTANCE=v201902-py3-debian-9-2019-2-py3
# - env: INSTANCE=v201902-py3-ubuntu-1804-2019-2-py3

62
kitchen.yml
View File

@ -11,42 +11,42 @@ driver:
# Make sure the platforms listed below match up with
# the `env.matrix` instances defined in `.travis.yml`
platforms:
## SALT `3000.2`
- name: debian-10-3000-2-py3
## SALT `3000.3`
- name: debian-10-3000-3-py3
driver:
image: netmanagers/salt-3000.2-py3:debian-10
- name: debian-9-3000-2-py3
image: netmanagers/salt-3000.3-py3:debian-10
- name: debian-9-3000-3-py3
driver:
image: netmanagers/salt-3000.2-py3:debian-9
- name: ubuntu-1804-3000-2-py3
image: netmanagers/salt-3000.3-py3:debian-9
- name: ubuntu-1804-3000-3-py3
driver:
image: netmanagers/salt-3000.2-py3:ubuntu-18.04
- name: centos-8-3000-2-py3
image: netmanagers/salt-3000.3-py3:ubuntu-18.04
- name: centos-8-3000-3-py3
driver:
image: netmanagers/salt-3000.2-py3:centos-8
- name: centos-7-3000-2-py3
image: netmanagers/salt-3000.3-py3:centos-8
- name: centos-7-3000-3-py3
driver:
image: netmanagers/salt-3000.2-py3:centos-7
- name: fedora-31-3000-2-py3
image: netmanagers/salt-3000.3-py3:centos-7
- name: fedora-31-3000-3-py3
driver:
image: netmanagers/salt-3000.2-py3:fedora-31
- name: opensuse-leap-151-3000-2-py3
image: netmanagers/salt-3000.3-py3:fedora-31
- name: opensuse-leap-151-3000-3-py3
driver:
image: netmanagers/salt-3000.2-py3:opensuse-leap-15.1
image: netmanagers/salt-3000.3-py3:opensuse-leap-15.1
run_command: /usr/lib/systemd/systemd
# Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
- name: amazonlinux-2-3000-2-py3
- name: amazonlinux-2-3000-3-py3
driver:
image: netmanagers/salt-3000.2-py3:amazonlinux-2
- name: ubuntu-1804-3000-2-py2
image: netmanagers/salt-3000.3-py3:amazonlinux-2
- name: ubuntu-1804-3000-3-py2
driver:
image: netmanagers/salt-3000.2-py2:ubuntu-18.04
- name: ubuntu-1604-3000-2-py2
image: netmanagers/salt-3000.3-py2:ubuntu-18.04
- name: ubuntu-1604-3000-3-py2
driver:
image: netmanagers/salt-3000.2-py2:ubuntu-16.04
image: netmanagers/salt-3000.3-py2:ubuntu-16.04
## SALT `2019.2`
- name: debian-10-2019-2-py3
@ -111,14 +111,14 @@ verifier:
suites:
- name: v3000-py3
includes:
- debian-10-3000-2-py3
- debian-9-3000-2-py3
- ubuntu-1804-3000-2-py3
- centos-8-3000-2-py3
- centos-7-3000-2-py3
- fedora-31-3000-2-py3
- opensuse-leap-151-3000-2-py3
- amazonlinux-2-3000-2-py3
- debian-10-3000-3-py3
- debian-9-3000-3-py3
- ubuntu-1804-3000-3-py3
- centos-8-3000-3-py3
- centos-7-3000-3-py3
- fedora-31-3000-3-py3
- opensuse-leap-151-3000-3-py3
- amazonlinux-2-3000-3-py3
provisioner:
state_top:
base:
@ -140,8 +140,8 @@ suites:
- path: test/integration/v3000-py3
- name: v3000-py2
includes:
- ubuntu-1804-3000-2-py2
- ubuntu-1604-3000-2-py2
- ubuntu-1804-3000-3-py2
- ubuntu-1604-3000-3-py2
provisioner:
state_top:
base: