From 1696246e429b625a0e013f484fc78b29d9e0b563 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 28 May 2020 17:15:31 +0100 Subject: [PATCH] ci(kitchen+travis): add new platforms [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/203 --- .travis.yml | 12 +++++++----- kitchen.yml | 24 +++++++++++++++--------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 19d1828..043729e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,18 +59,20 @@ jobs: # Make sure the instances listed below match up with # the `platforms` defined in `kitchen.yml` - env: INSTANCE=default-debian-10-master-py3 + - env: INSTANCE=default-ubuntu-2004-master-py3 # - env: INSTANCE=default-ubuntu-1804-master-py3 - env: INSTANCE=default-centos-8-master-py3 + - env: INSTANCE=default-fedora-32-master-py3 # - env: INSTANCE=default-fedora-31-master-py3 - # - env: INSTANCE=default-opensuse-leap-151-master-py3 + # - env: INSTANCE=default-opensuse-leap-152-master-py3 # - env: INSTANCE=default-amazonlinux-2-master-py3 # - 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-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-opensuse-leap-152-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 @@ -81,8 +83,8 @@ jobs: # - env: INSTANCE=default-ubuntu-1604-2019-2-py3 # - env: INSTANCE=default-centos-8-2019-2-py3 # - env: INSTANCE=default-centos-7-2019-2-py3 - - env: INSTANCE=default-fedora-31-2019-2-py3 - # - env: INSTANCE=default-opensuse-leap-151-2019-2-py3 + # - env: INSTANCE=default-fedora-31-2019-2-py3 + # - env: INSTANCE=default-opensuse-leap-152-2019-2-py3 # - env: INSTANCE=default-amazonlinux-2-2019-2-py3 # - env: INSTANCE=default-centos-6-2019-2-py2 # - env: INSTANCE=default-amazonlinux-1-2019-2-py2 diff --git a/kitchen.yml b/kitchen.yml index 8d44b08..9e05436 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -15,20 +15,26 @@ platforms: - name: debian-10-master-py3 driver: image: netmanagers/salt-master-py3:debian-10 + - name: ubuntu-2004-master-py3 + driver: + image: netmanagers/salt-master-py3:ubuntu-20.04 - name: ubuntu-1804-master-py3 driver: image: netmanagers/salt-master-py3:ubuntu-18.04 - name: centos-8-master-py3 driver: image: netmanagers/salt-master-py3:centos-8 + - name: fedora-32-master-py3 + driver: + image: netmanagers/salt-master-py3:fedora-32 - name: fedora-31-master-py3 driver: image: netmanagers/salt-master-py3:fedora-31 - - name: opensuse-leap-151-master-py3 + - name: opensuse-leap-152-master-py3 driver: - image: netmanagers/salt-master-py3:opensuse-leap-15.1 + image: netmanagers/salt-master-py3:opensuse-leap-15.2 run_command: /usr/lib/systemd/systemd - # Workaround to avoid intermittent failures on `opensuse-leap-15.1`: + # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 @@ -55,11 +61,11 @@ platforms: - name: fedora-31-3000-3-py3 driver: image: netmanagers/salt-3000.3-py3:fedora-31 - - name: opensuse-leap-151-3000-3-py3 + - name: opensuse-leap-152-3000-3-py3 driver: - image: netmanagers/salt-3000.3-py3:opensuse-leap-15.1 + image: netmanagers/salt-3000.3-py3:opensuse-leap-15.2 run_command: /usr/lib/systemd/systemd - # Workaround to avoid intermittent failures on `opensuse-leap-15.1`: + # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 @@ -99,11 +105,11 @@ platforms: - name: fedora-31-2019-2-py3 driver: image: netmanagers/salt-2019.2-py3:fedora-31 - - name: opensuse-leap-151-2019-2-py3 + - name: opensuse-leap-152-2019-2-py3 driver: - image: netmanagers/salt-2019.2-py3:opensuse-leap-15.1 + image: netmanagers/salt-2019.2-py3:opensuse-leap-15.2 run_command: /usr/lib/systemd/systemd - # Workaround to avoid intermittent failures on `opensuse-leap-15.1`: + # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1