瀏覽代碼

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

* Automated using https://github.com/myii/ssf-formula/pull/124
tags/v1.1.3
Imran Iqbal 4 年之前
父節點
當前提交
d2d51864a5
共有 2 個文件被更改,包括 14 次插入12 次删除
  1. +3
    -3
      .travis.yml
  2. +11
    -9
      kitchen.yml

+ 3
- 3
.travis.yml 查看文件

@@ -66,16 +66,16 @@ jobs:
# - env: INSTANCE=v201707-py2-debian-8-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-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=v201803-py2-debian-9-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-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=v201902-py2-ubuntu-1804-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-py3-debian-10-2019-2-py3
# - env: INSTANCE=v201902-py3-debian-9-2019-2-py3

+ 11
- 9
kitchen.yml 查看文件

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

Loading…
取消
儲存