From 7a36cb10f83f235de351fdb7cb20b4de56ea379c Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Wed, 1 Apr 2020 23:41:43 +0100
Subject: [PATCH] ci(kitchen+travis): adjust matrix to update `3000` to
`3000.1` [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/146
---
.travis.yml | 16 ++++++++--------
kitchen.yml | 34 +++++++++++++++++-----------------
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index ff19435..234a7a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,16 +62,16 @@ jobs:
# - env: INSTANCE=default-ubuntu-1804-master-py3
- env: INSTANCE=default-centos-8-master-py3
# - env: INSTANCE=default-fedora-31-master-py3
- - env: INSTANCE=suse-opensuse-leap-151-master-py3
+ # - env: INSTANCE=suse-opensuse-leap-151-master-py3
# - env: INSTANCE=default-amazonlinux-2-master-py3
# - env: INSTANCE=default-arch-base-latest-master-py2
- # - env: INSTANCE=default-debian-10-3000-py3
- - env: INSTANCE=default-ubuntu-1804-3000-py3
- # - env: INSTANCE=default-centos-8-3000-py3
- # - env: INSTANCE=default-fedora-31-3000-py3
- # - env: INSTANCE=suse-opensuse-leap-151-3000-py3
- - env: INSTANCE=default-amazonlinux-2-3000-py3
- # - env: INSTANCE=default-arch-base-latest-3000-py2
+ # - env: INSTANCE=default-debian-10-3000-1-py3
+ - env: INSTANCE=default-ubuntu-1804-3000-1-py3
+ # - env: INSTANCE=default-centos-8-3000-1-py3
+ # - env: INSTANCE=default-fedora-31-3000-1-py3
+ - env: INSTANCE=suse-opensuse-leap-151-3000-1-py3
+ - env: INSTANCE=default-amazonlinux-2-3000-1-py3
+ # - env: INSTANCE=default-arch-base-latest-3000-1-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 bb07a95..39f591b 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -40,33 +40,33 @@ platforms:
image: netmanagers/salt-master-py2:arch-base-latest
run_command: /usr/lib/systemd/systemd
- ## SALT `3000`
- - name: debian-10-3000-py3
+ ## SALT `3000.1`
+ - name: debian-10-3000-1-py3
driver:
- image: netmanagers/salt-3000-py3:debian-10
- - name: ubuntu-1804-3000-py3
+ image: netmanagers/salt-3000.1-py3:debian-10
+ - name: ubuntu-1804-3000-1-py3
driver:
- image: netmanagers/salt-3000-py3:ubuntu-18.04
- - name: centos-8-3000-py3
+ image: netmanagers/salt-3000.1-py3:ubuntu-18.04
+ - name: centos-8-3000-1-py3
driver:
- image: netmanagers/salt-3000-py3:centos-8
- - name: fedora-31-3000-py3
+ image: netmanagers/salt-3000.1-py3:centos-8
+ - name: fedora-31-3000-1-py3
driver:
- image: netmanagers/salt-3000-py3:fedora-31
- - name: opensuse-leap-151-3000-py3
+ image: netmanagers/salt-3000.1-py3:fedora-31
+ - name: opensuse-leap-151-3000-1-py3
driver:
- image: netmanagers/salt-3000-py3:opensuse-leap-15.1
+ image: netmanagers/salt-3000.1-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-py3
+ - name: amazonlinux-2-3000-1-py3
driver:
- image: netmanagers/salt-3000-py3:amazonlinux-2
- - name: arch-base-latest-3000-py2
+ image: netmanagers/salt-3000.1-py3:amazonlinux-2
+ - name: arch-base-latest-3000-1-py2
driver:
- image: netmanagers/salt-3000-py2:arch-base-latest
+ image: netmanagers/salt-3000.1-py2:arch-base-latest
run_command: /usr/lib/systemd/systemd
## SALT `2019.2`
@@ -176,7 +176,7 @@ suites:
- name: default
excludes:
- opensuse-leap-151-master-py3
- - opensuse-leap-151-3000-py3
+ - opensuse-leap-151-3000-1-py3
- opensuse-leap-151-2019-2-py3
- opensuse-leap-151-2018-3-py2
provisioner:
@@ -199,7 +199,7 @@ suites:
- name: suse
includes:
- opensuse-leap-151-master-py3
- - opensuse-leap-151-3000-py3
+ - opensuse-leap-151-3000-1-py3
- opensuse-leap-151-2019-2-py3
- opensuse-leap-151-2018-3-py2
provisioner: