Skip to content

Commit faefcab

Browse files
myiimyii
committed
ci(kitchen+travis): upgrade matrix after 2019.2.2 release [skip ci]
* Automated using myii/ssf-formula#86
1 parent 0665878 commit faefcab

File tree

2 files changed

+61
-78
lines changed

2 files changed

+61
-78
lines changed

‎.travis.yml

+16-14
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
script:
3737
# Install and run `salt-lint`
3838
- pip install --user salt-lint
39-
- git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$'
39+
- git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$\|\.tst$'
4040
| xargs -I {} salt-lint {}
4141
# Install and run `yamllint`
4242
# Need at least `v1.17.0` for the `yaml-files` setting
@@ -62,31 +62,33 @@ jobs:
6262
# Make sure the instances listed below match up with
6363
# the `platforms` defined in `kitchen.yml`
6464
- env: INSTANCE=default-debian-10-master-py3
65-
# - env: INSTANCE=default-ubuntu-1804-develop-py3
66-
# - env: INSTANCE=default-centos-7-develop-py3
67-
# - env: INSTANCE=default-fedora-30-develop-py3
68-
# - env: INSTANCE=default-opensuse-leap-15-develop-py3
69-
# - env: INSTANCE=default-amazonlinux-2-develop-py2
70-
# - env: INSTANCE=default-arch-base-latest-develop-py2
65+
# - env: INSTANCE=default-ubuntu-1804-master-py3
66+
# - env: INSTANCE=default-centos-8-master-py3
67+
# - env: INSTANCE=default-fedora-31-master-py3
68+
# - env: INSTANCE=default-opensuse-leap-151-master-py3
69+
# - env: INSTANCE=default-amazonlinux-2-master-py2
70+
# - env: INSTANCE=default-arch-base-latest-master-py2
71+
# - env: INSTANCE=default-debian-10-2019-2-py3
7172
# - env: INSTANCE=default-debian-9-2019-2-py3
7273
- env: INSTANCE=default-ubuntu-1804-2019-2-py3
73-
- env: INSTANCE=default-centos-7-2019-2-py3
74-
# - env: INSTANCE=default-fedora-30-2019-2-py3
75-
# - env: INSTANCE=default-opensuse-leap-15-2019-2-py3
74+
- env: INSTANCE=default-centos-8-2019-2-py3
75+
# - env: INSTANCE=default-fedora-31-2019-2-py3
76+
# - env: INSTANCE=default-opensuse-leap-151-2019-2-py3
77+
# - env: INSTANCE=default-centos-7-2019-2-py2
7678
# - env: INSTANCE=default-amazonlinux-2-2019-2-py2
7779
- env: INSTANCE=default-arch-base-latest-2019-2-py2
80+
- env: INSTANCE=default-fedora-30-2018-3-py3
7881
# - env: INSTANCE=default-debian-9-2018-3-py2
7982
# - env: INSTANCE=default-ubuntu-1604-2018-3-py2
8083
# - env: INSTANCE=default-centos-7-2018-3-py2
81-
- env: INSTANCE=default-fedora-29-2018-3-py2
82-
- env: INSTANCE=default-opensuse-leap-15-2018-3-py2
84+
- env: INSTANCE=default-opensuse-leap-151-2018-3-py2
8385
# - env: INSTANCE=default-amazonlinux-2-2018-3-py2
8486
# - env: INSTANCE=default-arch-base-latest-2018-3-py2
8587
# - env: INSTANCE=default-debian-8-2017-7-py2
8688
# - env: INSTANCE=default-ubuntu-1604-2017-7-py2
8789
- env: INSTANCE=default-centos-6-2017-7-py2
88-
# - env: INSTANCE=default-fedora-29-2017-7-py2
89-
# - env: INSTANCE=default-opensuse-leap-15-2017-7-py2
90+
# - env: INSTANCE=default-fedora-30-2017-7-py2
91+
# - env: INSTANCE=default-opensuse-leap-151-2017-7-py2
9092
# - env: INSTANCE=default-amazonlinux-2-2017-7-py2
9193
# - env: INSTANCE=default-arch-base-latest-2017-7-py2
9294

‎kitchen.yml

+45-64
Original file line numberDiff line numberDiff line change
@@ -11,88 +11,83 @@ driver:
1111
# Make sure the platforms listed below match up with
1212
# the `env.matrix` instances defined in `.travis.yml`
1313
platforms:
14-
## SALT `develop` => `master`
14+
## SALT `master`
1515
- name: debian-10-master-py3
1616
driver:
1717
image: netmanagers/salt-master-py3:debian-10
1818
provision_command:
1919
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
2020
- sh bootstrap-salt.sh -XdPbfrq -x python3 git master
21-
- name: ubuntu-1804-develop-py3
21+
- name: ubuntu-1804-master-py3
2222
driver:
23-
image: netmanagers/salt-develop-py3:ubuntu-18.04
23+
image: netmanagers/salt-master-py3:ubuntu-18.04
2424
provision_command:
2525
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
26-
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
27-
- name: centos-7-develop-py3
26+
- sh bootstrap-salt.sh -XdPbfrq -x python3 git master
27+
- name: centos-8-master-py3
2828
driver:
29-
image: netmanagers/salt-develop-py3:centos-7
29+
image: netmanagers/salt-master-py3:centos-8
3030
provision_command:
3131
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
32-
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
33-
- name: fedora-30-develop-py3
32+
- sh bootstrap-salt.sh -XdPbfrq -x python3 git master
33+
- name: fedora-31-master-py3
3434
driver:
35-
image: netmanagers/salt-develop-py3:fedora-30
35+
image: netmanagers/salt-master-py3:fedora-31
3636
provision_command:
3737
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
38-
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
39-
- name: opensuse-leap-15-develop-py3
38+
- sh bootstrap-salt.sh -XdPbfrq -x python3 git master
39+
- name: opensuse-leap-151-master-py3
4040
driver:
41-
image: opensuse/leap:15
41+
image: netmanagers/salt-master-py3:opensuse-leap-15.1
4242
provision_command:
43-
# yamllint disable-line rule:line-length
44-
- zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python3-pip
45-
- systemctl enable sshd.service
43+
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
44+
- sh bootstrap-salt.sh -XdPbfrq -x python3 git master
4645
run_command: /usr/lib/systemd/systemd
47-
provisioner:
48-
salt_bootstrap_options: -XdPfrq -x python3 git develop
49-
salt_install: bootstrap
50-
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
46+
# Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
5147
# => SCP did not finish successfully (255): (Net::SCP::Error)
5248
transport:
5349
max_ssh_sessions: 1
54-
- name: amazonlinux-2-develop-py2
50+
- name: amazonlinux-2-master-py2
5551
driver:
56-
image: netmanagers/salt-develop-py2:amazonlinux-2
52+
image: netmanagers/salt-master-py2:amazonlinux-2
5753
provision_command:
5854
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
59-
- sh bootstrap-salt.sh -XdPbfrq -x python2 git develop
60-
- name: arch-base-latest-develop-py2
55+
- sh bootstrap-salt.sh -XdPbfrq -x python2 git master
56+
- name: arch-base-latest-master-py2
6157
driver:
62-
image: netmanagers/salt-develop-py2:arch-base-latest
58+
image: netmanagers/salt-master-py2:arch-base-latest
6359
provision_command:
6460
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
65-
- sh bootstrap-salt.sh -XdPbfrq -x python2 git develop
61+
- sh bootstrap-salt.sh -XdPbfrq -x python2 git master
6662
run_command: /usr/lib/systemd/systemd
6763

6864
## SALT `2019.2`
65+
- name: debian-10-2019-2-py3
66+
driver:
67+
image: netmanagers/salt-2019.2-py3:debian-10
6968
- name: debian-9-2019-2-py3
7069
driver:
7170
image: netmanagers/salt-2019.2-py3:debian-9
7271
- name: ubuntu-1804-2019-2-py3
7372
driver:
7473
image: netmanagers/salt-2019.2-py3:ubuntu-18.04
75-
- name: centos-7-2019-2-py3
74+
- name: centos-8-2019-2-py3
7675
driver:
77-
image: netmanagers/salt-2019.2-py3:centos-7
78-
- name: fedora-30-2019-2-py3
76+
image: netmanagers/salt-2019.2-py3:centos-8
77+
- name: fedora-31-2019-2-py3
7978
driver:
80-
image: netmanagers/salt-2019.2-py3:fedora-30
81-
- name: opensuse-leap-15-2019-2-py3
79+
image: netmanagers/salt-2019.2-py3:fedora-31
80+
- name: opensuse-leap-151-2019-2-py3
8281
driver:
83-
image: opensuse/leap:15
84-
provision_command:
85-
# yamllint disable-line rule:line-length
86-
- zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python3-pip
87-
- systemctl enable sshd.service
82+
image: netmanagers/salt-2019.2-py3:opensuse-leap-15.1
8883
run_command: /usr/lib/systemd/systemd
89-
provisioner:
90-
salt_bootstrap_options: -XdPfrq -x python3 git 2019.2
91-
salt_install: bootstrap
92-
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
84+
# Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
9385
# => SCP did not finish successfully (255): (Net::SCP::Error)
9486
transport:
9587
max_ssh_sessions: 1
88+
- name: centos-7-2019-2-py2
89+
driver:
90+
image: netmanagers/salt-2019.2-py2:centos-7
9691
- name: amazonlinux-2-2019-2-py2
9792
driver:
9893
image: netmanagers/salt-2019.2-py2:amazonlinux-2
@@ -102,6 +97,9 @@ platforms:
10297
run_command: /usr/lib/systemd/systemd
10398

10499
## SALT `2018.3`
100+
- name: fedora-30-2018-3-py3
101+
driver:
102+
image: netmanagers/salt-2018.3-py3:fedora-30
105103
- name: debian-9-2018-3-py2
106104
driver:
107105
image: netmanagers/salt-2018.3-py2:debian-9
@@ -111,21 +109,11 @@ platforms:
111109
- name: centos-7-2018-3-py2
112110
driver:
113111
image: netmanagers/salt-2018.3-py2:centos-7
114-
- name: fedora-29-2018-3-py2
115-
driver:
116-
image: netmanagers/salt-2018.3-py2:fedora-29
117-
- name: opensuse-leap-15-2018-3-py2
112+
- name: opensuse-leap-151-2018-3-py2
118113
driver:
119-
image: opensuse/leap:15
120-
provision_command:
121-
# yamllint disable-line rule:line-length
122-
- zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python2-pip
123-
- systemctl enable sshd.service
114+
image: netmanagers/salt-2018.3-py2:opensuse-leap-15.1
124115
run_command: /usr/lib/systemd/systemd
125-
provisioner:
126-
salt_bootstrap_options: -XdPfrq -x python2 git 2018.3
127-
salt_install: bootstrap
128-
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
116+
# Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
129117
# => SCP did not finish successfully (255): (Net::SCP::Error)
130118
transport:
131119
max_ssh_sessions: 1
@@ -148,21 +136,14 @@ platforms:
148136
driver:
149137
image: netmanagers/salt-2017.7-py2:centos-6
150138
run_command: /sbin/init
151-
- name: fedora-29-2017-7-py2
139+
- name: fedora-30-2017-7-py2
152140
driver:
153-
image: netmanagers/salt-2017.7-py2:fedora-29
154-
- name: opensuse-leap-15-2017-7-py2
141+
image: netmanagers/salt-2017.7-py2:fedora-30
142+
- name: opensuse-leap-151-2017-7-py2
155143
driver:
156-
image: opensuse/leap:15
157-
provision_command:
158-
# yamllint disable-line rule:line-length
159-
- zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python2-pip
160-
- systemctl enable sshd.service
144+
image: netmanagers/salt-2017.7-py2:opensuse-leap-15.1
161145
run_command: /usr/lib/systemd/systemd
162-
provisioner:
163-
salt_bootstrap_options: -XdPfrq -x python2 git 2017.7
164-
salt_install: bootstrap
165-
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
146+
# Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
166147
# => SCP did not finish successfully (255): (Net::SCP::Error)
167148
transport:
168149
max_ssh_sessions: 1

0 commit comments

Comments
 (0)