saltstack-formulas/nginx-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #242 from myii/ci/use-develop-image-in-matrix

Browse Source 
ci(kitchen+travis): modify matrix to include `develop` platform
This commit is contained in:
Imran Iqbal 2019-06-25 23:14:23 +01:00 committed by GitHub
commit c539594b19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 96 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
.travis.yml
View File

@ -11,23 +11,34 @@ language: ruby
services: services:
- docker - docker
before_install:
- bundle install
# 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: env:
matrix: matrix:
- INSTANCE: default-debian-9-2019-2-py3 - INSTANCE: default-debian-9-develop-py3
# - INSTANCE: default-ubuntu-1804-develop-py3
# - INSTANCE: default-centos-7-develop-py3
# - INSTANCE: default-fedora-29-develop-py3
# - INSTANCE: default-opensuse-leap-15-develop-py3
# - INSTANCE: default-debian-9-2019-2-py3
- INSTANCE: default-ubuntu-1804-2019-2-py3 - INSTANCE: default-ubuntu-1804-2019-2-py3
- INSTANCE: default-centos-7-2019-2-py2 - INSTANCE: default-centos-7-2019-2-py3
- INSTANCE: default-fedora-29-2019-2-py2 # - INSTANCE: default-fedora-29-2019-2-py3
- INSTANCE: default-opensuse-423-2018-3-py2 # - INSTANCE: default-opensuse-leap-15-2019-2-py3
- INSTANCE: default-debian-8-2018-3-py2 # - INSTANCE: default-debian-9-2018-3-py2
- INSTANCE: default-ubuntu-1604-2018-3-py2 # - INSTANCE: default-ubuntu-1604-2018-3-py2
- INSTANCE: default-fedora-28-2018-3-py2 # - INSTANCE: default-centos-7-2018-3-py2
- INSTANCE: default-debian-8-2017-7-py2 - INSTANCE: default-fedora-29-2018-3-py2
- INSTANCE: default-ubuntu-1604-2017-7-py2 # TODO: Use this when fixed instead of `opensuse-leap-42`
# Ref: https://github.com/netmanagers/salt-image-builder/issues/2
# - INSTANCE: default-opensuse-leap-15-2018-3-py2
- INSTANCE: default-opensuse-leap-42-2018-3-py2
# - INSTANCE: default-debian-8-2017-7-py2
# - INSTANCE: default-ubuntu-1604-2017-7-py2
# TODO: Enable after improving the formula to work with other than `systemd`
- INSTANCE: default-centos-6-2017-7-py2
# - INSTANCE: default-fedora-28-2017-7-py2
# - INSTANCE: default-opensuse-leap-42-2017-7-py2
script: script:
- bundle exec kitchen verify ${INSTANCE} - bundle exec kitchen verify ${INSTANCE}
@ -64,4 +75,3 @@ jobs:
script: script:
# Run `semantic-release` # Run `semantic-release`
- npx semantic-release@15 - npx semantic-release@15

100
kitchen.yml
View File

@ -11,54 +11,100 @@ 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`
- name: debian-9-develop-py3
driver:
image: netmanagers/salt-develop-py3:debian-9
provision_command:
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
- name: ubuntu-1804-develop-py3
driver:
image: netmanagers/salt-develop-py3:ubuntu-18.04
provision_command:
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
- name: centos-7-develop-py3
driver:
image: netmanagers/salt-develop-py3:centos-7
provision_command:
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
- name: fedora-29-develop-py3
driver:
image: netmanagers/salt-develop-py3:fedora-29
provision_command:
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
- name: opensuse-leap-15-develop-py3
driver:
image: netmanagers/salt-develop-py3:opensuse-leap-15
provision_command:
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
run_command: /usr/lib/systemd/systemd
## SALT 2019.2 ## SALT 2019.2
- 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-1804 image: netmanagers/salt-2019.2-py3:ubuntu-18.04
- name: centos-7-2019-2-py2 - name: centos-7-2019-2-py3
driver: driver:
image: netmanagers/salt-2019.2-py2:centos-7 image: netmanagers/salt-2019.2-py3:centos-7
- name: fedora-29-2019-2-py2 - name: fedora-29-2019-2-py3
driver: driver:
image: netmanagers/salt-2019.2-py2:fedora-29 image: netmanagers/salt-2019.2-py3:fedora-29
- name: opensuse-leap-15-2019-2-py3
driver:
image: netmanagers/salt-2019.2-py3:opensuse-leap-15
run_command: /usr/lib/systemd/systemd
## SALT 2018.3 ## SALT 2018.3
- name: opensuse-423-2018-3-py2 - name: debian-9-2018-3-py2
driver: driver:
image: netmanagers/salt-2018.3-py2:opensuse-423 image: netmanagers/salt-2018.3-py2:debian-9
run_command: /usr/lib/systemd/systemd
- name: debian-8-2018-3-py2
driver:
image: netmanagers/salt-2018.3-py2:debian-8
- name: ubuntu-1604-2018-3-py2 - name: ubuntu-1604-2018-3-py2
driver: driver:
image: netmanagers/salt-2018.3-py2:ubuntu-1604 image: netmanagers/salt-2018.3-py2:ubuntu-16.04
- name: fedora-28-2018-3-py2 - name: centos-7-2018-3-py2
driver: driver:
image: netmanagers/salt-2018.3-py2:fedora-28 image: netmanagers/salt-2018.3-py2:centos-7
- name: fedora-29-2018-3-py2
# centos-6 guest fails on Debian hosts due to vsyscall issues, see driver:
# https://hub.docker.com/_/centos, "A note about vsyscall" image: netmanagers/salt-2018.3-py2:fedora-29
# Disabled for `template-formula` because not `systemd` based # TODO: Use this when fixed instead of `opensuse-leap-42`
# - name: centos-6-2018-3 # Ref: https://github.com/netmanagers/salt-image-builder/issues/2
# - name: opensuse-leap-15-2018-3-py2
# driver: # driver:
# image: netmanagers/salt-2018.3-py2:centos-6 # image: netmanagers/salt-2018.3-py2:opensuse-leap-15
# run_command: /sbin/init # run_command: /usr/lib/systemd/systemd
- name: opensuse-leap-42-2018-3-py2
driver:
image: netmanagers/salt-2018.3-py2:opensuse-leap-42
run_command: /usr/lib/systemd/systemd
##S SALT 2017.7 ## SALT 2017.7
- name: debian-8-2017-7-py2 - name: debian-8-2017-7-py2
driver: driver:
image: netmanagers/salt-2017.7-py2:debian-8 image: netmanagers/salt-2017.7-py2:debian-8
- name: ubuntu-1604-2017-7-py2 - name: ubuntu-1604-2017-7-py2
driver: driver:
image: netmanagers/salt-2017.7-py2:ubuntu-1604 image: netmanagers/salt-2017.7-py2:ubuntu-16.04
# - name: centos-6-2017-7 # TODO: Modify the formula to work for non-`systemd` platforms
# driver: - name: centos-6-2017-7-py2
# image: netmanagers/salt-2017.7-py2:centos-6 driver:
# run_command: /sbin/init image: netmanagers/salt-2017.7-py2:centos-6
run_command: /sbin/init
- name: fedora-28-2017-7-py2
driver:
image: netmanagers/salt-2017.7-py2:fedora-28
- name: opensuse-leap-42-2017-7-py2
driver:
image: netmanagers/salt-2017.7-py2:opensuse-leap-42
run_command: /usr/lib/systemd/systemd
provisioner: provisioner:
name: salt_solo name: salt_solo