Salt
/
cron-formula
mirror of https://github.com/saltstack-formulas/cron-formula.git
0
0
Fork 0
Code Issues Activity

ci(kitchen+travis): upgrade matrix after `2019.2.2` release [skip ci] 

* Automated using https://github.com/myii/ssf-formula/pull/86
This commit is contained in:
Imran Iqbal 2019-10-30 04:50:41 +00:00
parent aca0d9e437
commit 2062f10f94
2 changed files with 66 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
.travis.yml
View File

@ -16,10 +16,10 @@ script:
# yamllint disable rule:line-length # yamllint disable rule:line-length
# Converge and verify the instance; `saltcheck` relies upon the `converge` as well # Converge and verify the instance; `saltcheck` relies upon the `converge` as well
- bin/kitchen verify "${INSTANCE}" - bin/kitchen verify "${INSTANCE}"
# If a `develop` instance, get the appropriate version of `saltcheck.py` (temporary) # If a `master` instance, get the appropriate version of `saltcheck.py` (temporary)
# Likewise, use a custom `cron.py` temporarily until the upstream PR is merged: # Likewise, use a custom `cron.py` temporarily until the upstream PR is merged:
# - https://github.com/saltstack/salt/pull/55016 # - https://github.com/saltstack/salt/pull/55016
- if [ ! -z $(echo "${INSTANCE}" | grep \\-develop-) ]; then - if [ ! -z $(echo "${INSTANCE}" | grep \\-master-) ]; then
bin/kitchen exec "${INSTANCE}" -c bin/kitchen exec "${INSTANCE}" -c
"sudo curl -o \$(find /usr/lib/ -type d -name modules | grep packages/salt/modules)/saltcheck.py "sudo curl -o \$(find /usr/lib/ -type d -name modules | grep packages/salt/modules)/saltcheck.py
https://raw.githubusercontent.com/myii/salt/fix/add-retcode/salt/modules/saltcheck.py"; https://raw.githubusercontent.com/myii/salt/fix/add-retcode/salt/modules/saltcheck.py";
@ -27,8 +27,8 @@ script:
"sudo curl -o \$(find /usr/lib/ -type d -name modules | grep packages/salt/modules)/cron.py "sudo curl -o \$(find /usr/lib/ -type d -name modules | grep packages/salt/modules)/cron.py
https://raw.githubusercontent.com/myii/salt/fix/add-retcode/salt/modules/cron.py"; https://raw.githubusercontent.com/myii/salt/fix/add-retcode/salt/modules/cron.py";
fi fi
# If a `develop` instance, run all of the `saltcheck` tests # If a `master` instance, run all of the `saltcheck` tests
- if [ ! -z $(echo "${INSTANCE}" | grep \\-develop-) ]; then - if [ ! -z $(echo "${INSTANCE}" | grep \\-master-) ]; then
bin/kitchen exec "${INSTANCE}" -c bin/kitchen exec "${INSTANCE}" -c
"sudo salt-call "sudo salt-call
--config-dir=/tmp/kitchen/etc/salt --config-dir=/tmp/kitchen/etc/salt
@ -73,31 +73,33 @@ jobs:
# Make sure the instances listed below match up with # Make sure the instances listed below match up with
# the `platforms` defined in `kitchen.yml` # the `platforms` defined in `kitchen.yml`
- env: INSTANCE=default-debian-10-master-py3 - env: INSTANCE=default-debian-10-master-py3
# - env: INSTANCE=default-ubuntu-1804-develop-py3 # - env: INSTANCE=default-ubuntu-1804-master-py3
# - env: INSTANCE=default-centos-7-develop-py3 # - env: INSTANCE=default-centos-8-master-py3
# - env: INSTANCE=default-fedora-30-develop-py3 # - env: INSTANCE=default-fedora-31-master-py3
# - env: INSTANCE=default-opensuse-leap-15-develop-py3 # - env: INSTANCE=default-opensuse-leap-151-master-py3
# - env: INSTANCE=default-amazonlinux-2-develop-py2 # - env: INSTANCE=default-amazonlinux-2-master-py2
# - env: INSTANCE=default-arch-base-latest-develop-py2 # - env: INSTANCE=default-arch-base-latest-master-py2
# - env: INSTANCE=default-debian-10-2019-2-py3
# - env: INSTANCE=default-debian-9-2019-2-py3 # - env: INSTANCE=default-debian-9-2019-2-py3
- env: INSTANCE=default-ubuntu-1804-2019-2-py3 - env: INSTANCE=default-ubuntu-1804-2019-2-py3
# - env: INSTANCE=default-centos-7-2019-2-py3 # - env: INSTANCE=default-centos-8-2019-2-py3
# - env: INSTANCE=default-fedora-30-2019-2-py3 # - env: INSTANCE=default-fedora-31-2019-2-py3
# - env: INSTANCE=default-opensuse-leap-15-2019-2-py3 - env: INSTANCE=default-opensuse-leap-151-2019-2-py3
# - env: INSTANCE=default-centos-7-2019-2-py2
- env: INSTANCE=default-amazonlinux-2-2019-2-py2 - env: INSTANCE=default-amazonlinux-2-2019-2-py2
- env: INSTANCE=default-arch-base-latest-2019-2-py2 # - env: INSTANCE=default-arch-base-latest-2019-2-py2
- env: INSTANCE=default-fedora-30-2018-3-py3
# - env: INSTANCE=default-debian-9-2018-3-py2 # - env: INSTANCE=default-debian-9-2018-3-py2
# - env: INSTANCE=default-ubuntu-1604-2018-3-py2 # - env: INSTANCE=default-ubuntu-1604-2018-3-py2
# - env: INSTANCE=default-centos-7-2018-3-py2 # - env: INSTANCE=default-centos-7-2018-3-py2
- env: INSTANCE=default-fedora-29-2018-3-py2 # - env: INSTANCE=default-opensuse-leap-151-2018-3-py2
- env: INSTANCE=default-opensuse-leap-15-2018-3-py2
# - env: INSTANCE=default-amazonlinux-2-2018-3-py2 # - env: INSTANCE=default-amazonlinux-2-2018-3-py2
# - env: INSTANCE=default-arch-base-latest-2018-3-py2 - env: INSTANCE=default-arch-base-latest-2018-3-py2
# - env: INSTANCE=default-debian-8-2017-7-py2 # - env: INSTANCE=default-debian-8-2017-7-py2
# - env: INSTANCE=default-ubuntu-1604-2017-7-py2 # - env: INSTANCE=default-ubuntu-1604-2017-7-py2
- env: INSTANCE=default-centos-6-2017-7-py2 - env: INSTANCE=default-centos-6-2017-7-py2
# - env: INSTANCE=default-fedora-29-2017-7-py2 # - env: INSTANCE=default-fedora-30-2017-7-py2
# - env: INSTANCE=default-opensuse-leap-15-2017-7-py2 # - env: INSTANCE=default-opensuse-leap-151-2017-7-py2
# - env: INSTANCE=default-amazonlinux-2-2017-7-py2 # - env: INSTANCE=default-amazonlinux-2-2017-7-py2
# - env: INSTANCE=default-arch-base-latest-2017-7-py2 # - env: INSTANCE=default-arch-base-latest-2017-7-py2

109
kitchen.yml
View File

@ -11,88 +11,83 @@ driver:
# Make sure the platforms listed below match up with # Make sure the platforms listed below match up with
# the `env.matrix` instances defined in `.travis.yml` # the `env.matrix` instances defined in `.travis.yml`
platforms: platforms:
## SALT `develop` => `master` ## SALT `master`
- name: debian-10-master-py3 - name: debian-10-master-py3
driver: driver:
image: netmanagers/salt-master-py3:debian-10 image: netmanagers/salt-master-py3:debian-10
provision_command: provision_command:
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- sh bootstrap-salt.sh -XdPbfrq -x python3 git master - sh bootstrap-salt.sh -XdPbfrq -x python3 git master
- name: ubuntu-1804-develop-py3 - name: ubuntu-1804-master-py3
driver: driver:
image: netmanagers/salt-develop-py3:ubuntu-18.04 image: netmanagers/salt-master-py3:ubuntu-18.04
provision_command: provision_command:
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop - sh bootstrap-salt.sh -XdPbfrq -x python3 git master
- name: centos-7-develop-py3 - name: centos-8-master-py3
driver: driver:
image: netmanagers/salt-develop-py3:centos-7 image: netmanagers/salt-master-py3:centos-8
provision_command: provision_command:
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop - sh bootstrap-salt.sh -XdPbfrq -x python3 git master
- name: fedora-30-develop-py3 - name: fedora-31-master-py3
driver: driver:
image: netmanagers/salt-develop-py3:fedora-30 image: netmanagers/salt-master-py3:fedora-31
provision_command: provision_command:
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop - sh bootstrap-salt.sh -XdPbfrq -x python3 git master
- name: opensuse-leap-15-develop-py3 - name: opensuse-leap-151-master-py3
driver: driver:
image: opensuse/leap:15 image: netmanagers/salt-master-py3:opensuse-leap-15.1
provision_command: provision_command:
# yamllint disable-line rule:line-length - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python3-pip - sh bootstrap-salt.sh -XdPbfrq -x python3 git master
- systemctl enable sshd.service
run_command: /usr/lib/systemd/systemd run_command: /usr/lib/systemd/systemd
provisioner: # Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
salt_bootstrap_options: -XdPfrq -x python3 git develop
salt_install: bootstrap
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
# => SCP did not finish successfully (255): (Net::SCP::Error) # => SCP did not finish successfully (255): (Net::SCP::Error)
transport: transport:
max_ssh_sessions: 1 max_ssh_sessions: 1
- name: amazonlinux-2-develop-py2 - name: amazonlinux-2-master-py2
driver: driver:
image: netmanagers/salt-develop-py2:amazonlinux-2 image: netmanagers/salt-master-py2:amazonlinux-2
provision_command: provision_command:
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- sh bootstrap-salt.sh -XdPbfrq -x python2 git develop - sh bootstrap-salt.sh -XdPbfrq -x python2 git master
- name: arch-base-latest-develop-py2 - name: arch-base-latest-master-py2
driver: driver:
image: netmanagers/salt-develop-py2:arch-base-latest image: netmanagers/salt-master-py2:arch-base-latest
provision_command: provision_command:
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- sh bootstrap-salt.sh -XdPbfrq -x python2 git develop - sh bootstrap-salt.sh -XdPbfrq -x python2 git master
run_command: /usr/lib/systemd/systemd run_command: /usr/lib/systemd/systemd
## SALT `2019.2` ## SALT `2019.2`
- name: debian-10-2019-2-py3
driver:
image: netmanagers/salt-2019.2-py3:debian-10
- name: debian-9-2019-2-py3 - name: debian-9-2019-2-py3
driver: driver:
image: netmanagers/salt-2019.2-py3:debian-9 image: netmanagers/salt-2019.2-py3:debian-9
- name: ubuntu-1804-2019-2-py3 - name: ubuntu-1804-2019-2-py3
driver: driver:
image: netmanagers/salt-2019.2-py3:ubuntu-18.04 image: netmanagers/salt-2019.2-py3:ubuntu-18.04
- name: centos-7-2019-2-py3 - name: centos-8-2019-2-py3
driver: driver:
image: netmanagers/salt-2019.2-py3:centos-7 image: netmanagers/salt-2019.2-py3:centos-8
- name: fedora-30-2019-2-py3 - name: fedora-31-2019-2-py3
driver: driver:
image: netmanagers/salt-2019.2-py3:fedora-30 image: netmanagers/salt-2019.2-py3:fedora-31
- name: opensuse-leap-15-2019-2-py3 - name: opensuse-leap-151-2019-2-py3
driver: driver:
image: opensuse/leap:15 image: netmanagers/salt-2019.2-py3:opensuse-leap-15.1
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
run_command: /usr/lib/systemd/systemd run_command: /usr/lib/systemd/systemd
provisioner: # Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
salt_bootstrap_options: -XdPfrq -x python3 git 2019.2
salt_install: bootstrap
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
# => SCP did not finish successfully (255): (Net::SCP::Error) # => SCP did not finish successfully (255): (Net::SCP::Error)
transport: transport:
max_ssh_sessions: 1 max_ssh_sessions: 1
- name: centos-7-2019-2-py2
driver:
image: netmanagers/salt-2019.2-py2:centos-7
- name: amazonlinux-2-2019-2-py2 - name: amazonlinux-2-2019-2-py2
driver: driver:
image: netmanagers/salt-2019.2-py2:amazonlinux-2 image: netmanagers/salt-2019.2-py2:amazonlinux-2
@ -102,6 +97,9 @@ platforms:
run_command: /usr/lib/systemd/systemd run_command: /usr/lib/systemd/systemd
## SALT `2018.3` ## SALT `2018.3`
- name: fedora-30-2018-3-py3
driver:
image: netmanagers/salt-2018.3-py3:fedora-30
- name: debian-9-2018-3-py2 - name: debian-9-2018-3-py2
driver: driver:
image: netmanagers/salt-2018.3-py2:debian-9 image: netmanagers/salt-2018.3-py2:debian-9
@ -111,21 +109,11 @@ platforms:
- name: centos-7-2018-3-py2 - name: centos-7-2018-3-py2
driver: driver:
image: netmanagers/salt-2018.3-py2:centos-7 image: netmanagers/salt-2018.3-py2:centos-7
- name: fedora-29-2018-3-py2 - name: opensuse-leap-151-2018-3-py2
driver: driver:
image: netmanagers/salt-2018.3-py2:fedora-29 image: netmanagers/salt-2018.3-py2:opensuse-leap-15.1
- name: opensuse-leap-15-2018-3-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 run_command: /usr/lib/systemd/systemd
provisioner: # Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
salt_bootstrap_options: -XdPfrq -x python2 git 2018.3
salt_install: bootstrap
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
# => SCP did not finish successfully (255): (Net::SCP::Error) # => SCP did not finish successfully (255): (Net::SCP::Error)
transport: transport:
max_ssh_sessions: 1 max_ssh_sessions: 1
@ -148,21 +136,14 @@ platforms:
driver: driver:
image: netmanagers/salt-2017.7-py2:centos-6 image: netmanagers/salt-2017.7-py2:centos-6
run_command: /sbin/init run_command: /sbin/init
- name: fedora-29-2017-7-py2 - name: fedora-30-2017-7-py2
driver: driver:
image: netmanagers/salt-2017.7-py2:fedora-29 image: netmanagers/salt-2017.7-py2:fedora-30
- name: opensuse-leap-15-2017-7-py2 - name: opensuse-leap-151-2017-7-py2
driver: driver:
image: opensuse/leap:15 image: netmanagers/salt-2017.7-py2:opensuse-leap-15.1
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 run_command: /usr/lib/systemd/systemd
provisioner: # Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
salt_bootstrap_options: -XdPfrq -x python2 git 2017.7
salt_install: bootstrap
# Workaround to avoid intermittent failures on `opensuse-leap-15`:
# => SCP did not finish successfully (255): (Net::SCP::Error) # => SCP did not finish successfully (255): (Net::SCP::Error)
transport: transport:
max_ssh_sessions: 1 max_ssh_sessions: 1