Skip to content

Commit 702323c

Browse files
myiimyii
committed
ci(kitchen+travis): use latest pre-salted images [skip ci]
* Automated using myii/ssf-formula#238
1 parent 8735cf8 commit 702323c

File tree

2 files changed

+85
-89
lines changed

2 files changed

+85
-89
lines changed

‎.travis.yml‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -60,33 +60,35 @@ jobs:
6060
# the `platforms` defined in `kitchen.yml`
6161
- env: INSTANCE=default-debian-10-master-py3
6262
- env: INSTANCE=default-ubuntu-2004-master-py3
63-
- env: INSTANCE=default-ubuntu-1804-master-py3
64-
# - env: INSTANCE=default-centos-8-master-py3
63+
# - env: INSTANCE=default-ubuntu-1804-master-py3
64+
- env: INSTANCE=default-centos-8-master-py3
65+
- env: INSTANCE=default-fedora-32-master-py3
6566
# - env: INSTANCE=default-fedora-31-master-py3
66-
# - env: INSTANCE=default-opensuse-leap-151-master-py3
67-
# - env: INSTANCE=default-amazonlinux-2-master-py3
67+
- env: INSTANCE=default-opensuse-leap-152-master-py3
68+
- env: INSTANCE=default-amazonlinux-2-master-py3
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
6880
# - env: INSTANCE=default-debian-10-2019-2-py3
6981
# - env: INSTANCE=default-debian-9-2019-2-py3
7082
# - env: INSTANCE=default-ubuntu-1804-2019-2-py3
71-
- env: INSTANCE=default-centos-8-2019-2-py3
72-
- env: INSTANCE=default-fedora-31-2019-2-py3
73-
# - env: INSTANCE=default-opensuse-leap-151-2019-2-py3
74-
# - env: INSTANCE=default-centos-7-2019-2-py2
83+
# - env: INSTANCE=default-ubuntu-1604-2019-2-py3
84+
# - env: INSTANCE=default-centos-8-2019-2-py3
85+
# - env: INSTANCE=default-centos-7-2019-2-py3
86+
# - env: INSTANCE=default-fedora-31-2019-2-py3
87+
# - env: INSTANCE=default-opensuse-leap-152-2019-2-py3
7588
# - env: INSTANCE=default-amazonlinux-2-2019-2-py3
76-
# - env: INSTANCE=default-arch-base-latest-2019-2-py2
77-
# - env: INSTANCE=default-fedora-30-2018-3-py3
78-
# - env: INSTANCE=default-debian-9-2018-3-py2
79-
# - env: INSTANCE=default-centos-7-2018-3-py2
80-
- env: INSTANCE=default-opensuse-leap-151-2018-3-py2
81-
# - env: INSTANCE=default-amazonlinux-1-2018-3-py2
82-
# - env: INSTANCE=default-arch-base-latest-2018-3-py2
83-
# - env: INSTANCE=default-debian-8-2017-7-py2
84-
# - env: INSTANCE=default-ubuntu-1604-2017-7-py2
85-
- env: INSTANCE=default-centos-6-2017-7-py2
86-
# - env: INSTANCE=default-fedora-30-2017-7-py2
87-
# - env: INSTANCE=default-opensuse-leap-151-2017-7-py2
88-
# - env: INSTANCE=default-amazonlinux-1-2017-7-py2
89-
# - env: INSTANCE=default-arch-base-latest-2017-7-py2
89+
# - env: INSTANCE=default-centos-6-2019-2-py2
90+
# - env: INSTANCE=default-amazonlinux-1-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'

‎kitchen.yml‎

Lines changed: 61 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -24,115 +24,109 @@ platforms:
2424
- name: centos-8-master-py3
2525
driver:
2626
image: saltimages/salt-master-py3:centos-8
27+
- name: fedora-32-master-py3
28+
driver:
29+
image: saltimages/salt-master-py3:fedora-32
2730
- name: fedora-31-master-py3
2831
driver:
2932
image: saltimages/salt-master-py3:fedora-31
30-
- name: opensuse-leap-151-master-py3
33+
- name: opensuse-leap-152-master-py3
3134
driver:
32-
image: netmanagers/salt-master-py3:opensuse-leap-15.1
35+
image: saltimages/salt-master-py3:opensuse-leap-15.2
3336
run_command: /usr/lib/systemd/systemd
34-
# Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
37+
# Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
3538
# => SCP did not finish successfully (255): (Net::SCP::Error)
3639
transport:
3740
max_ssh_sessions: 1
3841
- name: amazonlinux-2-master-py3
3942
driver:
4043
image: saltimages/salt-master-py3:amazonlinux-2
4144

42-
## SALT `2019.2`
43-
- name: debian-10-2019-2-py3
45+
## SALT `3000.3`
46+
- name: debian-10-3000-3-py3
4447
driver:
45-
image: saltimages/salt-2019.2-py3:debian-10
46-
- name: debian-9-2019-2-py3
48+
image: saltimages/salt-3000.3-py3:debian-10
49+
- name: debian-9-3000-3-py3
4750
driver:
48-
image: saltimages/salt-2019.2-py3:debian-9
49-
- name: ubuntu-1804-2019-2-py3
51+
image: saltimages/salt-3000.3-py3:debian-9
52+
- name: ubuntu-1804-3000-3-py3
5053
driver:
51-
image: saltimages/salt-2019.2-py3:ubuntu-18.04
52-
- name: centos-8-2019-2-py3
54+
image: saltimages/salt-3000.3-py3:ubuntu-18.04
55+
- name: centos-8-3000-3-py3
5356
driver:
54-
image: saltimages/salt-2019.2-py3:centos-8
55-
- name: fedora-31-2019-2-py3
57+
image: saltimages/salt-3000.3-py3:centos-8
58+
- name: centos-7-3000-3-py3
5659
driver:
57-
image: saltimages/salt-2019.2-py3:fedora-31
58-
- name: opensuse-leap-151-2019-2-py3
60+
image: saltimages/salt-3000.3-py3:centos-7
61+
- name: fedora-31-3000-3-py3
5962
driver:
60-
image: netmanagers/salt-2019.2-py3:opensuse-leap-15.1
63+
image: saltimages/salt-3000.3-py3:fedora-31
64+
- name: opensuse-leap-152-3000-3-py3
65+
driver:
66+
image: saltimages/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: centos-7-2019-2-py2
72+
- name: amazonlinux-2-3000-3-py3
6773
driver:
68-
image: netmanagers/salt-2019.2-py2:centos-7
69-
- name: amazonlinux-2-2019-2-py3
74+
image: saltimages/salt-3000.3-py3:amazonlinux-2
75+
- name: ubuntu-1804-3000-3-py2
7076
driver:
71-
image: saltimages/salt-2019.2-py3:amazonlinux-2
72-
- name: arch-base-latest-2019-2-py2
77+
image: saltimages/salt-3000.3-py2:ubuntu-18.04
78+
- name: ubuntu-1604-3000-3-py2
7379
driver:
74-
image: saltimages/salt-2019.2-py2:arch-base-latest
80+
image: saltimages/salt-3000.3-py2:ubuntu-16.04
81+
- name: arch-base-latest-3000-3-py2
82+
driver:
83+
image: saltimages/salt-3000.3-py2:arch-base-latest
7584
run_command: /usr/lib/systemd/systemd
7685

77-
## SALT `2018.3`
78-
- name: fedora-30-2018-3-py3
79-
driver:
80-
image: netmanagers/salt-2018.3-py3:fedora-30
81-
- name: debian-9-2018-3-py2
82-
driver:
83-
image: netmanagers/salt-2018.3-py2:debian-9
84-
- name: ubuntu-1604-2018-3-py2
85-
driver:
86-
image: netmanagers/salt-2018.3-py2:ubuntu-16.04
87-
- name: centos-7-2018-3-py2
88-
driver:
89-
image: netmanagers/salt-2018.3-py2:centos-7
90-
- name: opensuse-leap-151-2018-3-py2
86+
## SALT `2019.2`
87+
- name: debian-10-2019-2-py3
9188
driver:
92-
image: netmanagers/salt-2018.3-py2:opensuse-leap-15.1
93-
run_command: /usr/lib/systemd/systemd
94-
# Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
95-
# => SCP did not finish successfully (255): (Net::SCP::Error)
96-
transport:
97-
max_ssh_sessions: 1
98-
- name: amazonlinux-1-2018-3-py2
89+
image: saltimages/salt-2019.2-py3:debian-10
90+
- name: debian-9-2019-2-py3
9991
driver:
100-
image: netmanagers/salt-2018.3-py2:amazonlinux-1
101-
run_command: /sbin/init
102-
- name: arch-base-latest-2018-3-py2
92+
image: saltimages/salt-2019.2-py3:debian-9
93+
- name: ubuntu-1804-2019-2-py3
10394
driver:
104-
image: netmanagers/salt-2018.3-py2:arch-base-latest
105-
run_command: /usr/lib/systemd/systemd
106-
107-
## SALT `2017.7`
108-
- name: debian-8-2017-7-py2
95+
image: saltimages/salt-2019.2-py3:ubuntu-18.04
96+
- name: ubuntu-1604-2019-2-py3
10997
driver:
110-
image: netmanagers/salt-2017.7-py2:debian-8
111-
- name: ubuntu-1604-2017-7-py2
98+
image: saltimages/salt-2019.2-py3:ubuntu-16.04
99+
- name: centos-8-2019-2-py3
112100
driver:
113-
image: netmanagers/salt-2017.7-py2:ubuntu-16.04
114-
- name: centos-6-2017-7-py2
101+
image: saltimages/salt-2019.2-py3:centos-8
102+
- name: centos-7-2019-2-py3
115103
driver:
116-
image: netmanagers/salt-2017.7-py2:centos-6
117-
run_command: /sbin/init
118-
- name: fedora-30-2017-7-py2
104+
image: saltimages/salt-2019.2-py3:centos-7
105+
- name: fedora-31-2019-2-py3
119106
driver:
120-
image: netmanagers/salt-2017.7-py2:fedora-30
121-
- name: opensuse-leap-151-2017-7-py2
107+
image: saltimages/salt-2019.2-py3:fedora-31
108+
- name: opensuse-leap-152-2019-2-py3
122109
driver:
123-
image: netmanagers/salt-2017.7-py2:opensuse-leap-15.1
110+
image: saltimages/salt-2019.2-py3:opensuse-leap-15.2
124111
run_command: /usr/lib/systemd/systemd
125-
# Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
112+
# Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
126113
# => SCP did not finish successfully (255): (Net::SCP::Error)
127114
transport:
128115
max_ssh_sessions: 1
129-
- name: amazonlinux-1-2017-7-py2
116+
- name: amazonlinux-2-2019-2-py3
130117
driver:
131-
image: netmanagers/salt-2017.7-py2:amazonlinux-1
118+
image: saltimages/salt-2019.2-py3:amazonlinux-2
119+
- name: centos-6-2019-2-py2
120+
driver:
121+
image: saltimages/salt-2019.2-py2:centos-6
122+
run_command: /sbin/init
123+
- name: amazonlinux-1-2019-2-py2
124+
driver:
125+
image: saltimages/salt-2019.2-py2:amazonlinux-1
132126
run_command: /sbin/init
133-
- name: arch-base-latest-2017-7-py2
127+
- name: arch-base-latest-2019-2-py2
134128
driver:
135-
image: netmanagers/salt-2017.7-py2:arch-base-latest
129+
image: saltimages/salt-2019.2-py2:arch-base-latest
136130
run_command: /usr/lib/systemd/systemd
137131

138132
provisioner:

0 commit comments

Comments
 (0)