Skip to content

Commit ed45614

Browse files
committed
ci(kitchen+travis): use latest pre-salted images
* Automated using myii/ssf-formula#217
1 parent 2a0e858 commit ed45614

File tree

3 files changed

+53
-47
lines changed

3 files changed

+53
-47
lines changed

.travis.yml

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -59,34 +59,36 @@ jobs:
5959
# Make sure the instances listed below match up with
6060
# the `platforms` defined in `kitchen.yml`
6161
- env: INSTANCE=default-debian-10-master-py3
62+
# - env: INSTANCE=default-ubuntu-2004-master-py3
6263
# - env: INSTANCE=default-ubuntu-1804-master-py3
6364
- env: INSTANCE=default-centos-8-master-py3
64-
- env: INSTANCE=default-fedora-31-master-py3
65-
- env: INSTANCE=default-opensuse-leap-151-master-py3
65+
- env: INSTANCE=default-fedora-32-master-py3
66+
# - env: INSTANCE=default-fedora-31-master-py3
67+
- env: INSTANCE=default-opensuse-leap-152-master-py3
6668
# - env: INSTANCE=default-amazonlinux-2-master-py3
67-
# - env: INSTANCE=default-debian-10-3000-2-py3
68-
# - env: INSTANCE=default-debian-9-3000-2-py3
69-
# - env: INSTANCE=default-ubuntu-1804-3000-2-py3
70-
# - env: INSTANCE=default-centos-8-3000-2-py3
71-
# - env: INSTANCE=default-centos-7-3000-2-py3
72-
# - env: INSTANCE=default-fedora-31-3000-2-py3
73-
# - env: INSTANCE=default-opensuse-leap-151-3000-2-py3
74-
# - env: INSTANCE=default-amazonlinux-2-3000-2-py3
75-
# - env: INSTANCE=default-ubuntu-1804-3000-2-py2
76-
# - env: INSTANCE=default-ubuntu-1604-3000-2-py2
77-
# - env: INSTANCE=arch-arch-base-latest-3000-2-py2
69+
# - env: INSTANCE=default-debian-10-3000-3-py3
70+
# - env: INSTANCE=default-debian-9-3000-3-py3
71+
# - env: INSTANCE=default-ubuntu-1804-3000-3-py3
72+
# - env: INSTANCE=default-centos-8-3000-3-py3
73+
# - env: INSTANCE=default-centos-7-3000-3-py3
74+
# - env: INSTANCE=default-fedora-31-3000-3-py3
75+
# - env: INSTANCE=default-opensuse-leap-152-3000-3-py3
76+
# - env: INSTANCE=default-amazonlinux-2-3000-3-py3
77+
# - env: INSTANCE=default-ubuntu-1804-3000-3-py2
78+
# - env: INSTANCE=default-ubuntu-1604-3000-3-py2
79+
# - env: INSTANCE=default-arch-base-latest-3000-3-py2
7880
# - env: INSTANCE=default-debian-10-2019-2-py3
7981
# - env: INSTANCE=default-debian-9-2019-2-py3
8082
# - env: INSTANCE=default-ubuntu-1804-2019-2-py3
8183
# - env: INSTANCE=default-ubuntu-1604-2019-2-py3
8284
# - env: INSTANCE=default-centos-8-2019-2-py3
8385
# - env: INSTANCE=default-centos-7-2019-2-py3
8486
# - env: INSTANCE=default-fedora-31-2019-2-py3
85-
# - env: INSTANCE=default-opensuse-leap-151-2019-2-py3
87+
# - env: INSTANCE=default-opensuse-leap-152-2019-2-py3
8688
# - env: INSTANCE=default-amazonlinux-2-2019-2-py3
8789
# - env: INSTANCE=default-centos-6-2019-2-py2
8890
# - env: INSTANCE=default-amazonlinux-1-2019-2-py2
89-
# env: INSTANCE=arch-arch-base-latest-2019-2-py2
91+
# - env: INSTANCE=default-arch-base-latest-2019-2-py2
9092

9193
## Define the release stage that runs `semantic-release`
9294
- stage: 'release'

.yamllint

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ ignore: |
1212
node_modules/
1313
test/**/states/**/*.sls
1414
.kitchen/
15-
golang/osfamilymap.yaml
1615
1716
yaml-files:
1817
# Default settings

kitchen.yml

Lines changed: 36 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -15,66 +15,72 @@ platforms:
1515
- name: debian-10-master-py3
1616
driver:
1717
image: netmanagers/salt-master-py3:debian-10
18+
- name: ubuntu-2004-master-py3
19+
driver:
20+
image: netmanagers/salt-master-py3:ubuntu-20.04
1821
- name: ubuntu-1804-master-py3
1922
driver:
2023
image: netmanagers/salt-master-py3:ubuntu-18.04
2124
- name: centos-8-master-py3
2225
driver:
2326
image: netmanagers/salt-master-py3:centos-8
27+
- name: fedora-32-master-py3
28+
driver:
29+
image: netmanagers/salt-master-py3:fedora-32
2430
- name: fedora-31-master-py3
2531
driver:
2632
image: netmanagers/salt-master-py3:fedora-31
27-
- name: opensuse-leap-151-master-py3
33+
- name: opensuse-leap-152-master-py3
2834
driver:
29-
image: netmanagers/salt-master-py3:opensuse-leap-15.1
35+
image: netmanagers/salt-master-py3:opensuse-leap-15.2
3036
run_command: /usr/lib/systemd/systemd
31-
# Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
37+
# Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
3238
# => SCP did not finish successfully (255): (Net::SCP::Error)
3339
transport:
3440
max_ssh_sessions: 1
3541
- name: amazonlinux-2-master-py3
3642
driver:
3743
image: netmanagers/salt-master-py3:amazonlinux-2
3844

39-
## SALT `3000.2`
40-
- name: debian-10-3000-2-py3
45+
## SALT `3000.3`
46+
- name: debian-10-3000-3-py3
4147
driver:
42-
image: netmanagers/salt-3000.2-py3:debian-10
43-
- name: debian-9-3000-2-py3
48+
image: netmanagers/salt-3000.3-py3:debian-10
49+
- name: debian-9-3000-3-py3
4450
driver:
45-
image: netmanagers/salt-3000.2-py3:debian-9
46-
- name: ubuntu-1804-3000-2-py3
51+
image: netmanagers/salt-3000.3-py3:debian-9
52+
- name: ubuntu-1804-3000-3-py3
4753
driver:
48-
image: netmanagers/salt-3000.2-py3:ubuntu-18.04
49-
- name: centos-8-3000-2-py3
54+
image: netmanagers/salt-3000.3-py3:ubuntu-18.04
55+
- name: centos-8-3000-3-py3
5056
driver:
51-
image: netmanagers/salt-3000.2-py3:centos-8
52-
- name: centos-7-3000-2-py3
57+
image: netmanagers/salt-3000.3-py3:centos-8
58+
- name: centos-7-3000-3-py3
5359
driver:
54-
image: netmanagers/salt-3000.2-py3:centos-7
55-
- name: fedora-31-3000-2-py3
60+
image: netmanagers/salt-3000.3-py3:centos-7
61+
- name: fedora-31-3000-3-py3
5662
driver:
57-
image: netmanagers/salt-3000.2-py3:fedora-31
58-
- name: opensuse-leap-151-3000-2-py3
63+
image: netmanagers/salt-3000.3-py3:fedora-31
64+
- name: opensuse-leap-152-3000-3-py3
5965
driver:
60-
image: netmanagers/salt-3000.2-py3:opensuse-leap-15.1
66+
image: netmanagers/salt-3000.3-py3:opensuse-leap-15.2
6167
run_command: /usr/lib/systemd/systemd
62-
# Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
68+
# Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
6369
# => SCP did not finish successfully (255): (Net::SCP::Error)
6470
transport:
6571
max_ssh_sessions: 1
66-
- name: amazonlinux-2-3000-2-py3
72+
- name: amazonlinux-2-3000-3-py3
6773
driver:
68-
image: netmanagers/salt-3000.2-py3:amazonlinux-2
69-
- name: ubuntu-1804-3000-2-py2
74+
image: netmanagers/salt-3000.3-py3:amazonlinux-2
75+
- name: ubuntu-1804-3000-3-py2
7076
driver:
71-
image: netmanagers/salt-3000.2-py2:ubuntu-18.04
72-
- name: ubuntu-1604-3000-2-py2
77+
image: netmanagers/salt-3000.3-py2:ubuntu-18.04
78+
- name: ubuntu-1604-3000-3-py2
7379
driver:
74-
image: netmanagers/salt-3000.2-py2:ubuntu-16.04
75-
- name: arch-base-latest-3000-2-py2
80+
image: netmanagers/salt-3000.3-py2:ubuntu-16.04
81+
- name: arch-base-latest-3000-3-py2
7682
driver:
77-
image: netmanagers/salt-3000.2-py2:arch-base-latest
83+
image: netmanagers/salt-3000.3-py2:arch-base-latest
7884
run_command: /usr/lib/systemd/systemd
7985

8086
## SALT `2019.2`
@@ -99,11 +105,11 @@ platforms:
99105
- name: fedora-31-2019-2-py3
100106
driver:
101107
image: netmanagers/salt-2019.2-py3:fedora-31
102-
- name: opensuse-leap-151-2019-2-py3
108+
- name: opensuse-leap-152-2019-2-py3
103109
driver:
104-
image: netmanagers/salt-2019.2-py3:opensuse-leap-15.1
110+
image: netmanagers/salt-2019.2-py3:opensuse-leap-15.2
105111
run_command: /usr/lib/systemd/systemd
106-
# Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
112+
# Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
107113
# => SCP did not finish successfully (255): (Net::SCP::Error)
108114
transport:
109115
max_ssh_sessions: 1
@@ -147,7 +153,6 @@ suites:
147153
state_top:
148154
base:
149155
'*':
150-
# golang.clean
151156
- golang
152157
pillars:
153158
top.sls:

0 commit comments

Comments
 (0)