Skip to content

Commit 42965a7

Browse files
author
Felipe Zipitría
authored
Merge pull request #110 from myii/chore/standardise-structure-220
ci(kitchen+travis): use latest pre-salted images
2 parents f49290c + b364744 commit 42965a7

File tree

2 files changed

+87
-88
lines changed

2 files changed

+87
-88
lines changed

‎.travis.yml‎

Lines changed: 23 additions & 21 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
63-
# - env: INSTANCE=default-centos-8-master-py3
64+
- env: INSTANCE=default-centos-8-master-py3
65+
- env: INSTANCE=default-fedora-32-master-py3
6466
# - env: INSTANCE=default-fedora-31-master-py3
65-
# - env: INSTANCE=default-opensuse-leap-151-master-py3
67+
# - env: INSTANCE=default-opensuse-leap-152-master-py3
6668
# - 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
6780
# - env: INSTANCE=default-debian-10-2019-2-py3
6881
# - env: INSTANCE=default-debian-9-2019-2-py3
69-
- env: INSTANCE=default-ubuntu-1804-2019-2-py3
82+
# - env: INSTANCE=default-ubuntu-1804-2019-2-py3
83+
# - env: INSTANCE=default-ubuntu-1604-2019-2-py3
7084
# - env: INSTANCE=default-centos-8-2019-2-py3
85+
# - env: INSTANCE=default-centos-7-2019-2-py3
7186
# - env: INSTANCE=default-fedora-31-2019-2-py3
72-
- env: INSTANCE=default-opensuse-leap-151-2019-2-py3
73-
# - env: INSTANCE=default-centos-7-2019-2-py2
74-
- env: INSTANCE=default-amazonlinux-2-2019-2-py3
75-
# - env: INSTANCE=default-arch-base-latest-2019-2-py2
76-
- env: INSTANCE=default-fedora-30-2018-3-py3
77-
# - env: INSTANCE=default-debian-9-2018-3-py2
78-
# - env: INSTANCE=default-ubuntu-1604-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
87+
# - env: INSTANCE=default-opensuse-leap-152-2019-2-py3
88+
# - env: INSTANCE=default-amazonlinux-2-2019-2-py3
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: 64 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -15,121 +15,118 @@ 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 `2019.2`
40-
- name: debian-10-2019-2-py3
45+
## SALT `3000.3`
46+
- name: debian-10-3000-3-py3
4147
driver:
42-
image: netmanagers/salt-2019.2-py3:debian-10
43-
- name: debian-9-2019-2-py3
48+
image: netmanagers/salt-3000.3-py3:debian-10
49+
- name: debian-9-3000-3-py3
4450
driver:
45-
image: netmanagers/salt-2019.2-py3:debian-9
46-
- name: ubuntu-1804-2019-2-py3
51+
image: netmanagers/salt-3000.3-py3:debian-9
52+
- name: ubuntu-1804-3000-3-py3
4753
driver:
48-
image: netmanagers/salt-2019.2-py3:ubuntu-18.04
49-
- name: centos-8-2019-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-2019.2-py3:centos-8
52-
- name: fedora-31-2019-2-py3
57+
image: netmanagers/salt-3000.3-py3:centos-8
58+
- name: centos-7-3000-3-py3
5359
driver:
54-
image: netmanagers/salt-2019.2-py3:fedora-31
55-
- name: opensuse-leap-151-2019-2-py3
60+
image: netmanagers/salt-3000.3-py3:centos-7
61+
- name: fedora-31-3000-3-py3
5662
driver:
57-
image: netmanagers/salt-2019.2-py3:opensuse-leap-15.1
63+
image: netmanagers/salt-3000.3-py3:fedora-31
64+
- name: opensuse-leap-152-3000-3-py3
65+
driver:
66+
image: netmanagers/salt-3000.3-py3:opensuse-leap-15.2
5867
run_command: /usr/lib/systemd/systemd
59-
# Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
68+
# Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
6069
# => SCP did not finish successfully (255): (Net::SCP::Error)
6170
transport:
6271
max_ssh_sessions: 1
63-
- name: centos-7-2019-2-py2
72+
- name: amazonlinux-2-3000-3-py3
6473
driver:
65-
image: netmanagers/salt-2019.2-py2:centos-7
66-
- name: amazonlinux-2-2019-2-py3
74+
image: netmanagers/salt-3000.3-py3:amazonlinux-2
75+
- name: ubuntu-1804-3000-3-py2
6776
driver:
68-
image: netmanagers/salt-2019.2-py3:amazonlinux-2
69-
- name: arch-base-latest-2019-2-py2
77+
image: netmanagers/salt-3000.3-py2:ubuntu-18.04
78+
- name: ubuntu-1604-3000-3-py2
7079
driver:
71-
image: netmanagers/salt-2019.2-py2:arch-base-latest
80+
image: netmanagers/salt-3000.3-py2:ubuntu-16.04
81+
- name: arch-base-latest-3000-3-py2
82+
driver:
83+
image: netmanagers/salt-3000.3-py2:arch-base-latest
7284
run_command: /usr/lib/systemd/systemd
7385

74-
## SALT `2018.3`
75-
- name: fedora-30-2018-3-py3
76-
driver:
77-
image: netmanagers/salt-2018.3-py3:fedora-30
78-
- name: debian-9-2018-3-py2
79-
driver:
80-
image: netmanagers/salt-2018.3-py2:debian-9
81-
- name: ubuntu-1604-2018-3-py2
82-
driver:
83-
image: netmanagers/salt-2018.3-py2:ubuntu-16.04
84-
- name: centos-7-2018-3-py2
85-
driver:
86-
image: netmanagers/salt-2018.3-py2:centos-7
87-
- name: opensuse-leap-151-2018-3-py2
86+
## SALT `2019.2`
87+
- name: debian-10-2019-2-py3
8888
driver:
89-
image: netmanagers/salt-2018.3-py2:opensuse-leap-15.1
90-
run_command: /usr/lib/systemd/systemd
91-
# Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
92-
# => SCP did not finish successfully (255): (Net::SCP::Error)
93-
transport:
94-
max_ssh_sessions: 1
95-
- name: amazonlinux-1-2018-3-py2
89+
image: netmanagers/salt-2019.2-py3:debian-10
90+
- name: debian-9-2019-2-py3
9691
driver:
97-
image: netmanagers/salt-2018.3-py2:amazonlinux-1
98-
run_command: /sbin/init
99-
- name: arch-base-latest-2018-3-py2
92+
image: netmanagers/salt-2019.2-py3:debian-9
93+
- name: ubuntu-1804-2019-2-py3
10094
driver:
101-
image: netmanagers/salt-2018.3-py2:arch-base-latest
102-
run_command: /usr/lib/systemd/systemd
103-
104-
## SALT `2017.7`
105-
- name: debian-8-2017-7-py2
95+
image: netmanagers/salt-2019.2-py3:ubuntu-18.04
96+
- name: ubuntu-1604-2019-2-py3
10697
driver:
107-
image: netmanagers/salt-2017.7-py2:debian-8
108-
- name: ubuntu-1604-2017-7-py2
98+
image: netmanagers/salt-2019.2-py3:ubuntu-16.04
99+
- name: centos-8-2019-2-py3
109100
driver:
110-
image: netmanagers/salt-2017.7-py2:ubuntu-16.04
111-
- name: centos-6-2017-7-py2
101+
image: netmanagers/salt-2019.2-py3:centos-8
102+
- name: centos-7-2019-2-py3
112103
driver:
113-
image: netmanagers/salt-2017.7-py2:centos-6
114-
run_command: /sbin/init
115-
- name: fedora-30-2017-7-py2
104+
image: netmanagers/salt-2019.2-py3:centos-7
105+
- name: fedora-31-2019-2-py3
116106
driver:
117-
image: netmanagers/salt-2017.7-py2:fedora-30
118-
- name: opensuse-leap-151-2017-7-py2
107+
image: netmanagers/salt-2019.2-py3:fedora-31
108+
- name: opensuse-leap-152-2019-2-py3
119109
driver:
120-
image: netmanagers/salt-2017.7-py2:opensuse-leap-15.1
110+
image: netmanagers/salt-2019.2-py3:opensuse-leap-15.2
121111
run_command: /usr/lib/systemd/systemd
122-
# Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
112+
# Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
123113
# => SCP did not finish successfully (255): (Net::SCP::Error)
124114
transport:
125115
max_ssh_sessions: 1
126-
- name: amazonlinux-1-2017-7-py2
116+
- name: amazonlinux-2-2019-2-py3
127117
driver:
128-
image: netmanagers/salt-2017.7-py2:amazonlinux-1
118+
image: netmanagers/salt-2019.2-py3:amazonlinux-2
119+
- name: centos-6-2019-2-py2
120+
driver:
121+
image: netmanagers/salt-2019.2-py2:centos-6
122+
run_command: /sbin/init
123+
- name: amazonlinux-1-2019-2-py2
124+
driver:
125+
image: netmanagers/salt-2019.2-py2:amazonlinux-1
129126
run_command: /sbin/init
130-
- name: arch-base-latest-2017-7-py2
127+
- name: arch-base-latest-2019-2-py2
131128
driver:
132-
image: netmanagers/salt-2017.7-py2:arch-base-latest
129+
image: netmanagers/salt-2019.2-py2:arch-base-latest
133130
run_command: /usr/lib/systemd/systemd
134131

135132
provisioner:

0 commit comments

Comments
 (0)