From d93e3d2584b2a5a0e65458b65a104f188568251b Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 5 Feb 2020 14:07:07 +0000 Subject: [PATCH] ci(kitchen): avoid using bootstrap for `master` instances [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/124 --- .travis.yml | 8 ++++---- kitchen.yml | 48 ++++++++++++++---------------------------------- 2 files changed, 18 insertions(+), 38 deletions(-) diff --git a/.travis.yml b/.travis.yml index e148521..b39d3e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,7 +63,7 @@ jobs: # - env: INSTANCE=centos-centos-8-master-py3 # - env: INSTANCE=fedora-fedora-31-master-py3 # - env: INSTANCE=suse-opensuse-leap-151-master-py3 - # - env: INSTANCE=amazon-amazonlinux-2-master-py2 + # - env: INSTANCE=amazon-amazonlinux-2-master-py3 # - env: INSTANCE=arch-arch-base-latest-master-py2 # - env: INSTANCE=debian-debian-10-2019-2-py3 # - env: INSTANCE=debian-debian-9-2019-2-py3 @@ -72,21 +72,21 @@ jobs: # - env: INSTANCE=fedora-fedora-31-2019-2-py3 - env: INSTANCE=suse-opensuse-leap-151-2019-2-py3 # - env: INSTANCE=centos-centos-7-2019-2-py2 - - env: INSTANCE=amazon-amazonlinux-2-2019-2-py2 + - env: INSTANCE=amazon-amazonlinux-2-2019-2-py3 # - env: INSTANCE=arch-arch-base-latest-2019-2-py2 - env: INSTANCE=fedora-fedora-30-2018-3-py3 # - env: INSTANCE=debian-debian-9-2018-3-py2 # - env: INSTANCE=ubuntu-ubuntu-1604-2018-3-py2 - env: INSTANCE=centos-centos-7-2018-3-py2 # - env: INSTANCE=suse-opensuse-leap-151-2018-3-py2 - # - env: INSTANCE=amazon-amazonlinux-2-2018-3-py2 + # - env: INSTANCE=amazon-amazonlinux-1-2018-3-py2 # - env: INSTANCE=arch-arch-base-latest-2018-3-py2 # - env: INSTANCE=debian-debian-8-2017-7-py2 # - env: INSTANCE=ubuntu-ubuntu-1604-2017-7-py2 # - env: INSTANCE=centos-centos-6-2017-7-py2 # - env: INSTANCE=fedora-fedora-30-2017-7-py2 # - env: INSTANCE=suse-opensuse-leap-151-2017-7-py2 - # - env: INSTANCE=amazon-amazonlinux-2-2017-7-py2 + # - env: INSTANCE=amazon-amazonlinux-1-2017-7-py2 - env: INSTANCE=arch-arch-base-latest-2017-7-py2 ## Define the release stage that runs `semantic-release` diff --git a/kitchen.yml b/kitchen.yml index e9df1eb..2476874 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -16,52 +16,30 @@ platforms: driver: 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 - apt-get install -y snapd - name: ubuntu-1804-master-py3 driver: 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 driver: 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 driver: 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 driver: 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 # Workaround to avoid intermittent failures on `opensuse-leap-15.1`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - # Use the `develop` image temporarily until the `master` image is available - # Not changing the name to minimise disruption across all of the formulas - - name: amazonlinux-2-master-py2 + - name: amazonlinux-2-master-py3 driver: - image: netmanagers/salt-develop-py2:amazonlinux-2 - provision_command: - - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - - sh bootstrap-salt.sh -XdPbfrq -x python2 git develop + image: netmanagers/salt-master-py3:amazonlinux-2 - name: arch-base-latest-master-py2 driver: 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 ## SALT `2019.2` @@ -95,9 +73,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 @@ -126,9 +104,10 @@ platforms: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - 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 @@ -156,9 +135,10 @@ platforms: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - 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 @@ -286,10 +266,10 @@ suites: - path: test/integration/default - name: amazon includes: - - amazonlinux-2-master-py2 - - amazonlinux-2-2019-2-py2 - - amazonlinux-2-2018-3-py2 - - amazonlinux-2-2017-7-py2 + - amazonlinux-2-master-py3 + - amazonlinux-2-2019-2-py3 + - amazonlinux-1-2018-3-py2 + - amazonlinux-1-2017-7-py2 provisioner: state_top: base: