ci(kitchen+travis): adjust matrix to update 3000
to 3000.1
* Automated using https://github.com/myii/ssf-formula/pull/146
This commit is contained in:
parent
65f5c1c214
commit
a8fe65a2c8
14
.travis.yml
14
.travis.yml
@ -58,13 +58,13 @@ 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=v3000-py3-debian-10-3000-py3
|
- env: INSTANCE=v3000-py3-debian-10-3000-1-py3
|
||||||
- env: INSTANCE=v3000-py3-ubuntu-1804-3000-py3
|
- env: INSTANCE=v3000-py3-ubuntu-1804-3000-1-py3
|
||||||
- env: INSTANCE=v3000-py3-centos-8-3000-py3
|
- env: INSTANCE=v3000-py3-centos-8-3000-1-py3
|
||||||
- env: INSTANCE=v3000-py3-fedora-31-3000-py3
|
- env: INSTANCE=v3000-py3-fedora-31-3000-1-py3
|
||||||
# - env: INSTANCE=v3000-py3-opensuse-leap-151-3000-py3
|
# - env: INSTANCE=v3000-py3-opensuse-leap-151-3000-1-py3
|
||||||
- env: INSTANCE=v3000-py3-amazonlinux-2-3000-py3
|
- env: INSTANCE=v3000-py3-amazonlinux-2-3000-1-py3
|
||||||
# - env: INSTANCE=v3000-py2-arch-base-latest-3000-py2
|
# - env: INSTANCE=v3000-py2-arch-base-latest-3000-1-py2
|
||||||
# - env: INSTANCE=v201902-py3-debian-10-2019-2-py3
|
# - env: INSTANCE=v201902-py3-debian-10-2019-2-py3
|
||||||
- env: INSTANCE=v201902-py3-debian-9-2019-2-py3
|
- env: INSTANCE=v201902-py3-debian-9-2019-2-py3
|
||||||
# - env: INSTANCE=v201902-py3-ubuntu-1804-2019-2-py3
|
# - env: INSTANCE=v201902-py3-ubuntu-1804-2019-2-py3
|
||||||
|
44
kitchen.yml
44
kitchen.yml
@ -11,33 +11,33 @@ driver:
|
|||||||
# Make sure the platforms listed below match up with
|
# Make sure the platforms listed below match up with
|
||||||
# the `env.matrix` instances defined in `.travis.yml`
|
# the `env.matrix` instances defined in `.travis.yml`
|
||||||
platforms:
|
platforms:
|
||||||
## SALT `3000`
|
## SALT `3000.1`
|
||||||
- name: debian-10-3000-py3
|
- name: debian-10-3000-1-py3
|
||||||
driver:
|
driver:
|
||||||
image: netmanagers/salt-3000-py3:debian-10
|
image: netmanagers/salt-3000.1-py3:debian-10
|
||||||
- name: ubuntu-1804-3000-py3
|
- name: ubuntu-1804-3000-1-py3
|
||||||
driver:
|
driver:
|
||||||
image: netmanagers/salt-3000-py3:ubuntu-18.04
|
image: netmanagers/salt-3000.1-py3:ubuntu-18.04
|
||||||
- name: centos-8-3000-py3
|
- name: centos-8-3000-1-py3
|
||||||
driver:
|
driver:
|
||||||
image: netmanagers/salt-3000-py3:centos-8
|
image: netmanagers/salt-3000.1-py3:centos-8
|
||||||
- name: fedora-31-3000-py3
|
- name: fedora-31-3000-1-py3
|
||||||
driver:
|
driver:
|
||||||
image: netmanagers/salt-3000-py3:fedora-31
|
image: netmanagers/salt-3000.1-py3:fedora-31
|
||||||
- name: opensuse-leap-151-3000-py3
|
- name: opensuse-leap-151-3000-1-py3
|
||||||
driver:
|
driver:
|
||||||
image: netmanagers/salt-3000-py3:opensuse-leap-15.1
|
image: netmanagers/salt-3000.1-py3:opensuse-leap-15.1
|
||||||
run_command: /usr/lib/systemd/systemd
|
run_command: /usr/lib/systemd/systemd
|
||||||
# Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
|
# Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
|
||||||
# => 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-3000-py3
|
- name: amazonlinux-2-3000-1-py3
|
||||||
driver:
|
driver:
|
||||||
image: netmanagers/salt-3000-py3:amazonlinux-2
|
image: netmanagers/salt-3000.1-py3:amazonlinux-2
|
||||||
- name: arch-base-latest-3000-py2
|
- name: arch-base-latest-3000-1-py2
|
||||||
driver:
|
driver:
|
||||||
image: netmanagers/salt-3000-py2:arch-base-latest
|
image: netmanagers/salt-3000.1-py2:arch-base-latest
|
||||||
run_command: /usr/lib/systemd/systemd
|
run_command: /usr/lib/systemd/systemd
|
||||||
|
|
||||||
## SALT `2019.2`
|
## SALT `2019.2`
|
||||||
@ -118,12 +118,12 @@ verifier:
|
|||||||
suites:
|
suites:
|
||||||
- name: v3000-py3
|
- name: v3000-py3
|
||||||
includes:
|
includes:
|
||||||
- debian-10-3000-py3
|
- debian-10-3000-1-py3
|
||||||
- ubuntu-1804-3000-py3
|
- ubuntu-1804-3000-1-py3
|
||||||
- centos-8-3000-py3
|
- centos-8-3000-1-py3
|
||||||
- fedora-31-3000-py3
|
- fedora-31-3000-1-py3
|
||||||
- opensuse-leap-151-3000-py3
|
- opensuse-leap-151-3000-1-py3
|
||||||
- amazonlinux-2-3000-py3
|
- amazonlinux-2-3000-1-py3
|
||||||
provisioner:
|
provisioner:
|
||||||
state_top:
|
state_top:
|
||||||
base:
|
base:
|
||||||
@ -145,7 +145,7 @@ suites:
|
|||||||
- path: test/integration/v3000-py3
|
- path: test/integration/v3000-py3
|
||||||
- name: v3000-py2
|
- name: v3000-py2
|
||||||
includes:
|
includes:
|
||||||
- arch-base-latest-3000-py2
|
- arch-base-latest-3000-1-py2
|
||||||
provisioner:
|
provisioner:
|
||||||
state_top:
|
state_top:
|
||||||
base:
|
base:
|
||||||
|
Loading…
Reference in New Issue
Block a user