From 7ad3b356c063b95b5f9a06258e652be0b2983c73 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 14 May 2020 18:34:22 +0100 Subject: [PATCH] ci(kitchen+travis): adjust matrix to add `3000.3` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/185 --- .travis.yml | 22 +++++++++++----------- kitchen.yml | 46 +++++++++++++++++++++++----------------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4b73144..af8352a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,17 +64,17 @@ jobs: # - env: INSTANCE=default-fedora-31-master-py3 # - env: INSTANCE=default-opensuse-leap-151-master-py3 # - env: INSTANCE=default-amazonlinux-2-master-py3 - # - env: INSTANCE=default-debian-10-3000-2-py3 - # - env: INSTANCE=default-debian-9-3000-2-py3 - - env: INSTANCE=default-ubuntu-1804-3000-2-py3 - # - env: INSTANCE=default-centos-8-3000-2-py3 - # - env: INSTANCE=default-centos-7-3000-2-py3 - # - env: INSTANCE=default-fedora-31-3000-2-py3 - - env: INSTANCE=default-opensuse-leap-151-3000-2-py3 - - env: INSTANCE=default-amazonlinux-2-3000-2-py3 - # - env: INSTANCE=default-ubuntu-1804-3000-2-py2 - # - env: INSTANCE=default-ubuntu-1604-3000-2-py2 - # - env: INSTANCE=default-arch-base-latest-3000-2-py2 + # - env: INSTANCE=default-debian-10-3000-3-py3 + # - env: INSTANCE=default-debian-9-3000-3-py3 + - env: INSTANCE=default-ubuntu-1804-3000-3-py3 + # - env: INSTANCE=default-centos-8-3000-3-py3 + # - env: INSTANCE=default-centos-7-3000-3-py3 + # - env: INSTANCE=default-fedora-31-3000-3-py3 + - env: INSTANCE=default-opensuse-leap-151-3000-3-py3 + - env: INSTANCE=default-amazonlinux-2-3000-3-py3 + # - env: INSTANCE=default-ubuntu-1804-3000-3-py2 + # - env: INSTANCE=default-ubuntu-1604-3000-3-py2 + # - env: INSTANCE=default-arch-base-latest-3000-3-py2 # - env: INSTANCE=default-debian-10-2019-2-py3 # - env: INSTANCE=default-debian-9-2019-2-py3 # - env: INSTANCE=default-ubuntu-1804-2019-2-py3 diff --git a/kitchen.yml b/kitchen.yml index 206a661..8d44b08 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -36,45 +36,45 @@ platforms: driver: image: netmanagers/salt-master-py3:amazonlinux-2 - ## SALT `3000.2` - - name: debian-10-3000-2-py3 + ## SALT `3000.3` + - name: debian-10-3000-3-py3 driver: - image: netmanagers/salt-3000.2-py3:debian-10 - - name: debian-9-3000-2-py3 + image: netmanagers/salt-3000.3-py3:debian-10 + - name: debian-9-3000-3-py3 driver: - image: netmanagers/salt-3000.2-py3:debian-9 - - name: ubuntu-1804-3000-2-py3 + image: netmanagers/salt-3000.3-py3:debian-9 + - name: ubuntu-1804-3000-3-py3 driver: - image: netmanagers/salt-3000.2-py3:ubuntu-18.04 - - name: centos-8-3000-2-py3 + image: netmanagers/salt-3000.3-py3:ubuntu-18.04 + - name: centos-8-3000-3-py3 driver: - image: netmanagers/salt-3000.2-py3:centos-8 - - name: centos-7-3000-2-py3 + image: netmanagers/salt-3000.3-py3:centos-8 + - name: centos-7-3000-3-py3 driver: - image: netmanagers/salt-3000.2-py3:centos-7 - - name: fedora-31-3000-2-py3 + image: netmanagers/salt-3000.3-py3:centos-7 + - name: fedora-31-3000-3-py3 driver: - image: netmanagers/salt-3000.2-py3:fedora-31 - - name: opensuse-leap-151-3000-2-py3 + image: netmanagers/salt-3000.3-py3:fedora-31 + - name: opensuse-leap-151-3000-3-py3 driver: - image: netmanagers/salt-3000.2-py3:opensuse-leap-15.1 + image: netmanagers/salt-3000.3-py3:opensuse-leap-15.1 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 - - name: amazonlinux-2-3000-2-py3 + - name: amazonlinux-2-3000-3-py3 driver: - image: netmanagers/salt-3000.2-py3:amazonlinux-2 - - name: ubuntu-1804-3000-2-py2 + image: netmanagers/salt-3000.3-py3:amazonlinux-2 + - name: ubuntu-1804-3000-3-py2 driver: - image: netmanagers/salt-3000.2-py2:ubuntu-18.04 - - name: ubuntu-1604-3000-2-py2 + image: netmanagers/salt-3000.3-py2:ubuntu-18.04 + - name: ubuntu-1604-3000-3-py2 driver: - image: netmanagers/salt-3000.2-py2:ubuntu-16.04 - - name: arch-base-latest-3000-2-py2 + image: netmanagers/salt-3000.3-py2:ubuntu-16.04 + - name: arch-base-latest-3000-3-py2 driver: - image: netmanagers/salt-3000.2-py2:arch-base-latest + image: netmanagers/salt-3000.3-py2:arch-base-latest run_command: /usr/lib/systemd/systemd ## SALT `2019.2`