From 262c063f001bd8adf285c2cbb318116eccc80482 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 28 Aug 2019 07:41:39 +0100 Subject: [PATCH] ci(kitchen+travis): replace EOL pre-salted images * Automated using https://github.com/myii/ssf-formula/pull/16 --- .travis.yml | 18 ++++++++++++------ kitchen.yml | 50 ++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 54 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 475977b..d7cc8eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,23 +19,29 @@ services: # the `platforms` defined in `kitchen.yml` env: matrix: + - INSTANCE: default-debian-10-develop-py3 + # - INSTANCE: default-ubuntu-1804-develop-py3 + # - INSTANCE: default-centos-7-develop-py3 + # - INSTANCE: default-fedora-30-develop-py3 + # - INSTANCE: default-opensuse-leap-15-develop-py3 # - INSTANCE: default-amazonlinux-2-develop-py2 # - INSTANCE: default-debian-9-2019-2-py3 - INSTANCE: default-ubuntu-1804-2019-2-py3 # - INSTANCE: default-centos-7-2019-2-py3 - # - INSTANCE: default-fedora-29-2019-2-py3 - - INSTANCE: default-opensuse-leap-15-2019-2-py3 + - INSTANCE: default-fedora-30-2019-2-py3 + # - INSTANCE: default-opensuse-leap-15-2019-2-py3 # - INSTANCE: default-amazonlinux-2-2019-2-py2 - - INSTANCE: default-debian-9-2018-3-py2 + # - INSTANCE: default-debian-9-2018-3-py2 # - INSTANCE: default-ubuntu-1604-2018-3-py2 - INSTANCE: default-centos-7-2018-3-py2 # - INSTANCE: default-fedora-29-2018-3-py2 - # - INSTANCE: default-opensuse-leap-42-2018-3-py2 + - INSTANCE: default-opensuse-leap-15-2018-3-py2 + # - INSTANCE: default-amazonlinux-2-2018-3-py2 # - INSTANCE: default-debian-8-2017-7-py2 # - INSTANCE: default-ubuntu-1604-2017-7-py2 # - INSTANCE: default-centos-6-2017-7-py2 - - INSTANCE: default-fedora-28-2017-7-py2 - # - INSTANCE: default-opensuse-leap-42-2017-7-py2 + - INSTANCE: default-fedora-29-2017-7-py2 + # - INSTANCE: default-opensuse-leap-15-2017-7-py2 # - INSTANCE: default-amazonlinux-2-2017-7-py2 script: diff --git a/kitchen.yml b/kitchen.yml index 40c569f..41a59c9 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -12,6 +12,37 @@ driver: # the `env.matrix` instances defined in `.travis.yml` platforms: ## SALT `develop` + - name: debian-10-develop-py3 + driver: + image: netmanagers/salt-develop-py3:debian-10 + provision_command: + - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com + - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop + - name: ubuntu-1804-develop-py3 + driver: + image: netmanagers/salt-develop-py3:ubuntu-18.04 + provision_command: + - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com + - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop + - name: centos-7-develop-py3 + driver: + image: netmanagers/salt-develop-py3:centos-7 + provision_command: + - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com + - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop + - name: fedora-30-develop-py3 + driver: + image: netmanagers/salt-develop-py3:fedora-30 + provision_command: + - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com + - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop + - name: opensuse-leap-15-develop-py3 + driver: + image: netmanagers/salt-develop-py3:opensuse-leap-15 + provision_command: + - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com + - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop + run_command: /usr/lib/systemd/systemd - name: amazonlinux-2-develop-py2 driver: image: netmanagers/salt-develop-py2:amazonlinux-2 @@ -29,9 +60,9 @@ platforms: - name: centos-7-2019-2-py3 driver: image: netmanagers/salt-2019.2-py3:centos-7 - - name: fedora-29-2019-2-py3 + - name: fedora-30-2019-2-py3 driver: - image: netmanagers/salt-2019.2-py3:fedora-29 + image: netmanagers/salt-2019.2-py3:fedora-30 - name: opensuse-leap-15-2019-2-py3 driver: image: netmanagers/salt-2019.2-py3:opensuse-leap-15 @@ -53,10 +84,13 @@ platforms: - name: fedora-29-2018-3-py2 driver: image: netmanagers/salt-2018.3-py2:fedora-29 - - name: opensuse-leap-42-2018-3-py2 + - name: opensuse-leap-15-2018-3-py2 driver: - image: netmanagers/salt-2018.3-py2:opensuse-leap-42 + image: netmanagers/salt-2018.3-py2:opensuse-leap-15 run_command: /usr/lib/systemd/systemd + - name: amazonlinux-2-2018-3-py2 + driver: + image: netmanagers/salt-2018.3-py2:amazonlinux-2 ## SALT `2017.7` - name: debian-8-2017-7-py2 @@ -72,12 +106,12 @@ platforms: # driver: # image: netmanagers/salt-2017.7-py2:centos-6 # run_command: /sbin/init - - name: fedora-28-2017-7-py2 + - name: fedora-29-2017-7-py2 driver: - image: netmanagers/salt-2017.7-py2:fedora-28 - - name: opensuse-leap-42-2017-7-py2 + image: netmanagers/salt-2017.7-py2:fedora-29 + - name: opensuse-leap-15-2017-7-py2 driver: - image: netmanagers/salt-2017.7-py2:opensuse-leap-42 + image: netmanagers/salt-2017.7-py2:opensuse-leap-15 run_command: /usr/lib/systemd/systemd - name: amazonlinux-2-2017-7-py2 driver: