1
0
Fork 0

ci(kitchen): avoid using bootstrap for `master` instances [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/124
This commit is contained in:
Imran Iqbal 2020-02-05 14:08:47 +00:00
parent 1fc0e95f6a
commit 567ff29b98
2 changed files with 14 additions and 35 deletions

View File

@ -63,7 +63,7 @@ jobs:
# - env: INSTANCE=default-centos-8-master-py3 # - env: INSTANCE=default-centos-8-master-py3
# - env: INSTANCE=default-fedora-31-master-py3 # - env: INSTANCE=default-fedora-31-master-py3
# - env: INSTANCE=default-opensuse-leap-151-master-py3 # - env: INSTANCE=default-opensuse-leap-151-master-py3
# - env: INSTANCE=default-amazonlinux-2-master-py2 # - env: INSTANCE=default-amazonlinux-2-master-py3
# - env: INSTANCE=default-arch-base-latest-master-py2 # - env: INSTANCE=default-arch-base-latest-master-py2
# - env: INSTANCE=default-debian-10-2019-2-py3 # - env: INSTANCE=default-debian-10-2019-2-py3
# - env: INSTANCE=default-debian-9-2019-2-py3 # - env: INSTANCE=default-debian-9-2019-2-py3
@ -72,21 +72,21 @@ jobs:
# - env: INSTANCE=default-fedora-31-2019-2-py3 # - env: INSTANCE=default-fedora-31-2019-2-py3
- env: INSTANCE=default-opensuse-leap-151-2019-2-py3 - env: INSTANCE=default-opensuse-leap-151-2019-2-py3
# - env: INSTANCE=default-centos-7-2019-2-py2 # - env: INSTANCE=default-centos-7-2019-2-py2
- env: INSTANCE=default-amazonlinux-2-2019-2-py2 - env: INSTANCE=default-amazonlinux-2-2019-2-py3
# - env: INSTANCE=default-arch-base-latest-2019-2-py2 # - env: INSTANCE=default-arch-base-latest-2019-2-py2
- env: INSTANCE=default-fedora-30-2018-3-py3 - env: INSTANCE=default-fedora-30-2018-3-py3
# - env: INSTANCE=default-debian-9-2018-3-py2 # - env: INSTANCE=default-debian-9-2018-3-py2
# - env: INSTANCE=default-ubuntu-1604-2018-3-py2 # - env: INSTANCE=default-ubuntu-1604-2018-3-py2
# - env: INSTANCE=default-centos-7-2018-3-py2 # - env: INSTANCE=default-centos-7-2018-3-py2
# - env: INSTANCE=default-opensuse-leap-151-2018-3-py2 # - env: INSTANCE=default-opensuse-leap-151-2018-3-py2
# - env: INSTANCE=default-amazonlinux-2-2018-3-py2 # - env: INSTANCE=default-amazonlinux-1-2018-3-py2
- env: INSTANCE=default-arch-base-latest-2018-3-py2 - env: INSTANCE=default-arch-base-latest-2018-3-py2
# - env: INSTANCE=default-debian-8-2017-7-py2 # - env: INSTANCE=default-debian-8-2017-7-py2
# - env: INSTANCE=default-ubuntu-1604-2017-7-py2 # - env: INSTANCE=default-ubuntu-1604-2017-7-py2
- env: INSTANCE=default-centos-6-2017-7-py2 - env: INSTANCE=default-centos-6-2017-7-py2
# - env: INSTANCE=default-fedora-30-2017-7-py2 # - env: INSTANCE=default-fedora-30-2017-7-py2
# - env: INSTANCE=default-opensuse-leap-151-2017-7-py2 # - env: INSTANCE=default-opensuse-leap-151-2017-7-py2
# - env: INSTANCE=default-amazonlinux-2-2017-7-py2 # - env: INSTANCE=default-amazonlinux-1-2017-7-py2
# - env: INSTANCE=default-arch-base-latest-2017-7-py2 # - env: INSTANCE=default-arch-base-latest-2017-7-py2
## Define the release stage that runs `semantic-release` ## Define the release stage that runs `semantic-release`

View File

@ -15,52 +15,29 @@ platforms:
- name: debian-10-master-py3 - name: debian-10-master-py3
driver: driver:
image: netmanagers/salt-master-py3:debian-10 image: netmanagers/salt-master-py3:debian-10
provision_command:
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- sh bootstrap-salt.sh -XdPbfrq -x python3 git master
- name: ubuntu-1804-master-py3 - name: ubuntu-1804-master-py3
driver: driver:
image: netmanagers/salt-master-py3:ubuntu-18.04 image: netmanagers/salt-master-py3:ubuntu-18.04
provision_command:
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- sh bootstrap-salt.sh -XdPbfrq -x python3 git master
- name: centos-8-master-py3 - name: centos-8-master-py3
driver: driver:
image: netmanagers/salt-master-py3:centos-8 image: netmanagers/salt-master-py3:centos-8
provision_command:
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- sh bootstrap-salt.sh -XdPbfrq -x python3 git master
- name: fedora-31-master-py3 - name: fedora-31-master-py3
driver: driver:
image: netmanagers/salt-master-py3:fedora-31 image: netmanagers/salt-master-py3:fedora-31
provision_command:
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- sh bootstrap-salt.sh -XdPbfrq -x python3 git master
- name: opensuse-leap-151-master-py3 - name: opensuse-leap-151-master-py3
driver: driver:
image: netmanagers/salt-master-py3:opensuse-leap-15.1 image: netmanagers/salt-master-py3:opensuse-leap-15.1
provision_command:
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- sh bootstrap-salt.sh -XdPbfrq -x python3 git master
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
# Use the `develop` image temporarily until the `master` image is available - name: amazonlinux-2-master-py3
# Not changing the name to minimise disruption across all of the formulas
- name: amazonlinux-2-master-py2
driver: driver:
image: netmanagers/salt-develop-py2:amazonlinux-2 image: netmanagers/salt-master-py3:amazonlinux-2
provision_command:
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- sh bootstrap-salt.sh -XdPbfrq -x python2 git develop
- name: arch-base-latest-master-py2 - name: arch-base-latest-master-py2
driver: driver:
image: netmanagers/salt-master-py2:arch-base-latest image: netmanagers/salt-master-py2:arch-base-latest
provision_command:
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- sh bootstrap-salt.sh -XdPbfrq -x python2 git master
run_command: /usr/lib/systemd/systemd run_command: /usr/lib/systemd/systemd
## SALT `2019.2` ## SALT `2019.2`
@ -90,9 +67,9 @@ platforms:
- name: centos-7-2019-2-py2 - name: centos-7-2019-2-py2
driver: driver:
image: netmanagers/salt-2019.2-py2:centos-7 image: netmanagers/salt-2019.2-py2:centos-7
- name: amazonlinux-2-2019-2-py2 - name: amazonlinux-2-2019-2-py3
driver: driver:
image: netmanagers/salt-2019.2-py2:amazonlinux-2 image: netmanagers/salt-2019.2-py3:amazonlinux-2
- name: arch-base-latest-2019-2-py2 - name: arch-base-latest-2019-2-py2
driver: driver:
image: netmanagers/salt-2019.2-py2:arch-base-latest image: netmanagers/salt-2019.2-py2:arch-base-latest
@ -119,9 +96,10 @@ platforms:
# => 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-2018-3-py2 - name: amazonlinux-1-2018-3-py2
driver: driver:
image: netmanagers/salt-2018.3-py2:amazonlinux-2 image: netmanagers/salt-2018.3-py2:amazonlinux-1
run_command: /sbin/init
- name: arch-base-latest-2018-3-py2 - name: arch-base-latest-2018-3-py2
driver: driver:
image: netmanagers/salt-2018.3-py2:arch-base-latest image: netmanagers/salt-2018.3-py2:arch-base-latest
@ -149,9 +127,10 @@ platforms:
# => 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-2017-7-py2 - name: amazonlinux-1-2017-7-py2
driver: driver:
image: netmanagers/salt-2017.7-py2:amazonlinux-2 image: netmanagers/salt-2017.7-py2:amazonlinux-1
run_command: /sbin/init
- name: arch-base-latest-2017-7-py2 - name: arch-base-latest-2017-7-py2
driver: driver:
image: netmanagers/salt-2017.7-py2:arch-base-latest image: netmanagers/salt-2017.7-py2:arch-base-latest