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:24 +00:00
parent 6cd296ce54
commit d2d51864a5
2 changed files with 14 additions and 12 deletions

View File

@ -66,16 +66,16 @@ jobs:
# - env: INSTANCE=v201707-py2-debian-8-2017-7-py2 # - env: INSTANCE=v201707-py2-debian-8-2017-7-py2
- env: INSTANCE=v201707-py2-ubuntu-1604-2017-7-py2 - env: INSTANCE=v201707-py2-ubuntu-1604-2017-7-py2
- env: INSTANCE=v201707-py2-centos-6-2017-7-py2 - env: INSTANCE=v201707-py2-centos-6-2017-7-py2
# - env: INSTANCE=v201707-py2-amazonlinux-2-2017-7-py2 # - env: INSTANCE=v201707-py2-amazonlinux-1-2017-7-py2
# - env: INSTANCE=v201707-py2-arch-base-latest-2017-7-py2 # - env: INSTANCE=v201707-py2-arch-base-latest-2017-7-py2
- env: INSTANCE=v201803-py2-debian-9-2018-3-py2 - env: INSTANCE=v201803-py2-debian-9-2018-3-py2
# - env: INSTANCE=v201803-py2-ubuntu-1604-2018-3-py2 # - env: INSTANCE=v201803-py2-ubuntu-1604-2018-3-py2
- env: INSTANCE=v201803-py2-centos-7-2018-3-py2 - env: INSTANCE=v201803-py2-centos-7-2018-3-py2
# - env: INSTANCE=v201803-py2-amazonlinux-2-2018-3-py2 # - env: INSTANCE=v201803-py2-amazonlinux-1-2018-3-py2
# - env: INSTANCE=v201803-py2-arch-base-latest-2018-3-py2 # - env: INSTANCE=v201803-py2-arch-base-latest-2018-3-py2
- env: INSTANCE=v201902-py2-ubuntu-1804-2019-2-py2 - env: INSTANCE=v201902-py2-ubuntu-1804-2019-2-py2
# - env: INSTANCE=v201902-py2-centos-7-2019-2-py2 # - env: INSTANCE=v201902-py2-centos-7-2019-2-py2
- env: INSTANCE=v201902-py2-amazonlinux-2-2019-2-py2 - env: INSTANCE=v201902-py2-amazonlinux-2-2019-2-py3
# - env: INSTANCE=v201902-py2-arch-base-latest-2019-2-py2 # - env: INSTANCE=v201902-py2-arch-base-latest-2019-2-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

View File

@ -22,9 +22,10 @@ platforms:
driver: driver:
image: netmanagers/salt-2017.7-py2:centos-6 image: netmanagers/salt-2017.7-py2:centos-6
run_command: /sbin/init run_command: /sbin/init
- 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
@ -40,9 +41,10 @@ platforms:
- name: centos-7-2018-3-py2 - name: centos-7-2018-3-py2
driver: driver:
image: netmanagers/salt-2018.3-py2:centos-7 image: netmanagers/salt-2018.3-py2:centos-7
- 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
@ -55,9 +57,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
@ -135,7 +137,7 @@ suites:
includes: includes:
- ubuntu-1804-2019-2-py2 - ubuntu-1804-2019-2-py2
- centos-7-2019-2-py2 - centos-7-2019-2-py2
- amazonlinux-2-2019-2-py2 - amazonlinux-2-2019-2-py3
- arch-base-latest-2019-2-py2 - arch-base-latest-2019-2-py2
provisioner: provisioner:
state_top: state_top:
@ -161,7 +163,7 @@ suites:
- debian-9-2018-3-py2 - debian-9-2018-3-py2
- ubuntu-1604-2018-3-py2 - ubuntu-1604-2018-3-py2
- centos-7-2018-3-py2 - centos-7-2018-3-py2
- amazonlinux-2-2018-3-py2 - amazonlinux-1-2018-3-py2
- arch-base-latest-2018-3-py2 - arch-base-latest-2018-3-py2
provisioner: provisioner:
state_top: state_top:
@ -187,7 +189,7 @@ suites:
- debian-8-2017-7-py2 - debian-8-2017-7-py2
- ubuntu-1604-2017-7-py2 - ubuntu-1604-2017-7-py2
- centos-6-2017-7-py2 - centos-6-2017-7-py2
- amazonlinux-2-2017-7-py2 - amazonlinux-1-2017-7-py2
- arch-base-latest-2017-7-py2 - arch-base-latest-2017-7-py2
provisioner: provisioner:
state_top: state_top: