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

* Automated using myii/ssf-formula#124

.travis.yml

@@ -69,39 +69,35 @@ jobs:
  ## Define the rest of the matrix based on Kitchen testing
  # Make sure the instances listed below match up with
  # the `platforms` defined in `kitchen.yml`
- # - env: INSTANCE=amazonlinux-1-master-py2
  - env: INSTANCE=debian-10-master-py3
  # - env: INSTANCE=ubuntu-1804-master-py3
  # - env: INSTANCE=centos-8-master-py3
  # - env: INSTANCE=fedora-31-master-py3
  # - env: INSTANCE=opensuse-leap-151-master-py3
- # - env: INSTANCE=amazonlinux-2-master-py2
+ # - env: INSTANCE=amazonlinux-2-master-py3
  # - env: INSTANCE=arch-base-latest-master-py2
- # - env: INSTANCE=amazonlinux-1-2019-2-py2
  # - env: INSTANCE=debian-10-2019-2-py3
  # - env: INSTANCE=debian-9-2019-2-py3
  - env: INSTANCE=prod-server-ubuntu-1804-2019-2-py3
  # - env: INSTANCE=centos-8-2019-2-py3
  - env: INSTANCE=prod-server-fedora-31-2019-2-py3
  # - env: INSTANCE=opensuse-leap-151-2019-2-py3
  # - env: INSTANCE=centos-7-2019-2-py2
- - env: INSTANCE=prod-server-amazonlinux-2-2019-2-py2
+ - env: INSTANCE=prod-server-amazonlinux-2-2019-2-py3
  # - env: INSTANCE=arch-base-latest-2019-2-py2
  # - env: INSTANCE=fedora-30-2018-3-py3
- # - env: INSTANCE=amazonlinux-1-2018-3-py2
  # - env: INSTANCE=debian-9-2018-3-py2
  # - env: INSTANCE=ubuntu-1604-2018-3-py2
  - env: INSTANCE=prod-server-centos-7-2018-3-py2
  - env: INSTANCE=prod-server-opensuse-leap-151-2018-3-py2
- # - env: INSTANCE=amazonlinux-2-2018-3-py2
+ # - env: INSTANCE=amazonlinux-1-2018-3-py2
  # - env: INSTANCE=arch-base-latest-2018-3-py2
- # - env: INSTANCE=amazonlinux-1-2017-7-py2
  # - env: INSTANCE=debian-8-2017-7-py2
  # - env: INSTANCE=ubuntu-1604-2017-7-py2
  # - env: INSTANCE=centos-6-2017-7-py2
  # - env: INSTANCE=fedora-30-2017-7-py2
  # - env: INSTANCE=opensuse-leap-151-2017-7-py2
- # - env: INSTANCE=amazonlinux-2-2017-7-py2
+ # - env: INSTANCE=amazonlinux-1-2017-7-py2
  - env: INSTANCE=prod-server-arch-base-latest-2017-7-py2
 
  ## Define the release stage that runs `semantic-release`

kitchen.yml

@@ -12,72 +12,35 @@ driver:
 # the `env.matrix` instances defined in `.travis.yml`
 platforms:
  ## SALT `master`
- - name: amazonlinux-1-master-py2
- driver:
- image: amazonlinux:1
- provision_command:
- - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- - sh bootstrap-salt.sh -XdPfq -x python2 git master
- run_command: /sbin/init
  - name: debian-10-master-py3
  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
  - 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
- 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
+ - name: amazonlinux-2-master-py3
+ driver:
+ 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`
- - name: amazonlinux-1-2019-2-py2
- driver:
- image: amazonlinux:1
- provision_command:
- - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- - sh bootstrap-salt.sh -XdPfq -x python2 stable 2019.2
- run_command: /sbin/init
  - name: debian-10-2019-2-py3
  driver:
  image: netmanagers/salt-2019.2-py3:debian-10
@@ -104,9 +67,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
@@ -116,13 +79,6 @@ platforms:
  - name: fedora-30-2018-3-py3
  driver:
  image: netmanagers/salt-2018.3-py3:fedora-30
- - name: amazonlinux-1-2018-3-py2
- driver:
- image: amazonlinux:1
- provision_command:
- - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- - sh bootstrap-salt.sh -XdPfq -x python2 stable 2018.3
- run_command: /sbin/init
  - name: debian-9-2018-3-py2
  driver:
  image: netmanagers/salt-2018.3-py2:debian-9
@@ -140,22 +96,16 @@ 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
  run_command: /usr/lib/systemd/systemd
 
  ## SALT `2017.7`
- - name: amazonlinux-1-2017-7-py2
- driver:
- image: amazonlinux:1
- provision_command:
- - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- - sh bootstrap-salt.sh -XdPfq -x python2 stable 2017.7
- run_command: /sbin/init
  - name: debian-8-2017-7-py2
  driver:
  image: netmanagers/salt-2017.7-py2:debian-8
@@ -177,9 +127,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