Skip to content

Commit

Permalink
ci(kitchen+travis): adjust matrix to update 3000 to 3000.1 [skip ci]
Browse files Browse the repository at this point in the history
* Automated using myii/ssf-formula#146
  • Loading branch information
myii committed Apr 1, 2020
1 parent e3620b4 commit 7a36cb1
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 25 deletions.
16 changes: 8 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
34 changes: 17 additions & 17 deletions kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down

0 comments on commit 7a36cb1

Please sign in to comment.