saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

Merge pull request #441 from myii/ci/upgrade-matrix-after-2019.2.2

Browse Source 
ci(kitchen+travis): upgrade matrix after `2019.2.2` release
This commit is contained in:
Imran Iqbal 2019-10-29 22:21:45 +00:00 committed by GitHub
commit 0ec74afe22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.travis.yml
View File

@ -33,7 +33,7 @@ jobs:
script:
# Install and run `salt-lint`
- pip install --user salt-lint
- git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$'
- git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$\|\.tst$'
| xargs -I {} salt-lint {}
# Install and run `yamllint`
# Need at least `v1.17.0` for the `yaml-files` setting
@ -60,22 +60,20 @@ jobs:
- env: INSTANCE=v201707-py2-centos-6-2017-7-py2
# - env: INSTANCE=v201707-py2-amazonlinux-2-2017-7-py2
# - env: INSTANCE=v201707-py2-arch-base-latest-2017-7-py2
# - env: INSTANCE=v201803-py2-debian-9-2018-3-py2
- env: INSTANCE=v201803-py2-debian-9-2018-3-py2
# - env: INSTANCE=v201803-py2-ubuntu-1604-2018-3-py2
- env: INSTANCE=v201803-py2-centos-7-2018-3-py2
- env: INSTANCE=v201803-py2-amazonlinux-2-2018-3-py2
# - env: INSTANCE=v201803-py2-amazonlinux-2-2018-3-py2
# - env: INSTANCE=v201803-py2-arch-base-latest-2018-3-py2
- env: INSTANCE=v201902-py2-debian-9-2019-2-py2
- env: INSTANCE=v201902-py2-ubuntu-1804-2019-2-py2
# - env: INSTANCE=v201902-py2-centos-7-2019-2-py2
# - env: INSTANCE=v201902-py2-opensuse-leap-15-2019-2-py2
# - env: INSTANCE=v201902-py2-amazonlinux-2-2019-2-py2
- env: INSTANCE=v201902-py2-amazonlinux-2-2019-2-py2
# - env: INSTANCE=v201902-py2-arch-base-latest-2019-2-py2
- env: INSTANCE=v201902-py3-debian-10-2019-2-py3
# - env: INSTANCE=v201902-py3-debian-9-2019-2-py3
# - env: INSTANCE=v201902-py3-ubuntu-1804-2019-2-py3
# - env: INSTANCE=v201902-py3-centos-7-2019-2-py3
- env: INSTANCE=v201902-py3-fedora-30-2019-2-py3
- env: INSTANCE=v201902-py3-opensuse-leap-15-2019-2-py3
# - env: INSTANCE=v201902-py3-centos-8-2019-2-py3
- env: INSTANCE=v201902-py3-opensuse-leap-151-2019-2-py3
## Define the release stage that runs `semantic-release`
- stage: release

50
kitchen.yml
View File

@ -49,30 +49,12 @@ platforms:
run_command: /usr/lib/systemd/systemd
## SALT `2019.2`
- name: debian-9-2019-2-py2
driver:
image: netmanagers/salt-2019.2-py2:debian-9
- name: ubuntu-1804-2019-2-py2
driver:
image: netmanagers/salt-2019.2-py2:ubuntu-18.04
- name: centos-7-2019-2-py2
driver:
image: netmanagers/salt-2019.2-py2:centos-7
- name: opensuse-leap-15-2019-2-py2
driver:
image: opensuse/leap:15
provision_command:
# yamllint disable-line rule:line-length
- zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python2-pip
- systemctl enable sshd.service
run_command: /usr/lib/systemd/systemd
provisioner:
salt_bootstrap_options: -XdPfrq -x python2 git 2019.2
salt_install: bootstrap
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
- name: amazonlinux-2-2019-2-py2
driver:
image: netmanagers/salt-2019.2-py2:amazonlinux-2
@ -80,30 +62,26 @@ platforms:
driver:
image: netmanagers/salt-2019.2-py2:arch-base-latest
run_command: /usr/lib/systemd/systemd
- name: debian-10-2019-2-py3
driver:
image: netmanagers/salt-2019.2-py3:debian-10
- name: debian-9-2019-2-py3
driver:
image: netmanagers/salt-2019.2-py3:debian-9
- name: ubuntu-1804-2019-2-py3
driver:
image: netmanagers/salt-2019.2-py3:ubuntu-18.04
- name: centos-7-2019-2-py3
- name: centos-8-2019-2-py3
driver:
image: netmanagers/salt-2019.2-py3:centos-7
- name: fedora-30-2019-2-py3
image: netmanagers/salt-2019.2-py3:centos-8
- name: fedora-31-2019-2-py3
driver:
image: netmanagers/salt-2019.2-py3:fedora-30
- name: opensuse-leap-15-2019-2-py3
image: netmanagers/salt-2019.2-py3:fedora-31
- name: opensuse-leap-151-2019-2-py3
driver:
image: opensuse/leap:15
provision_command:
# yamllint disable-line rule:line-length
- zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python3-pip
- systemctl enable sshd.service
image: netmanagers/salt-2019.2-py3:opensuse-leap-15.1
run_command: /usr/lib/systemd/systemd
provisioner:
salt_bootstrap_options: -XdPfrq -x python3 git 2019.2
salt_install: bootstrap
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
# Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
@ -129,11 +107,11 @@ verifier:
suites:
- name: v201902-py3
includes:
- debian-10-2019-2-py3
- debian-9-2019-2-py3
- ubuntu-1804-2019-2-py3
- centos-7-2019-2-py3
- fedora-30-2019-2-py3
- opensuse-leap-15-2019-2-py3
- centos-8-2019-2-py3
- opensuse-leap-151-2019-2-py3
provisioner:
state_top:
base:
@ -155,10 +133,8 @@ suites:
- path: test/integration/v201902-py3
- name: v201902-py2
includes:
- debian-9-2019-2-py2
- ubuntu-1804-2019-2-py2
- centos-7-2019-2-py2
- opensuse-leap-15-2019-2-py2
- amazonlinux-2-2019-2-py2
- arch-base-latest-2019-2-py2
provisioner:

8
test/integration/v201902-py2/controls/pkgs_spec.rb
View File

@ -3,13 +3,9 @@
version =
case platform[:family]
when 'redhat'
'2019.2.0-1.el7'
when 'fedora'
'2019.2.0-1.fc30'
when 'suse'
'2019.2.0-lp151.5.3.1'
'2019.2.2-1.el7'
when 'debian'
'2019.2.0+ds-1'
'2019.2.2+ds-1'
end
control 'salt packages' do

8
test/integration/v201902-py3/controls/pkgs_spec.rb
View File

@ -5,16 +5,16 @@ version =
when 'redhat'
case platform[:name]
when 'amazon'
'2019.2.0-1.el7'
'2019.2.2-1.el7'
when 'centos'
'2019.2.0-2.el7'
'2019.2.2-1.el8'
end
when 'fedora'
'2019.2.0-1.fc30'
'2019.2.1rc0-3.fc31'
when 'suse'
'2019.2.0-lp151.5.3.1'
when 'debian'
'2019.2.0+ds-1'
'2019.2.2+ds-1'
end
control 'salt packages' do