Skip to content

Commit

Permalink
ci(kitchen+travis): add new platforms [skip ci]
Browse files Browse the repository at this point in the history
* Automated using myii/ssf-formula#203
  • Loading branch information
myii committed May 28, 2020
1 parent 768303d commit 91e57b5
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 12 deletions.
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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-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
Expand All @@ -82,7 +84,7 @@ jobs:
# - 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-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
Expand Down
24 changes: 15 additions & 9 deletions kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 91e57b5

Please sign in to comment.