Skip to content

Commit

Permalink
ci(kitchen+travis): use bootstrapped amazonlinux-1 images [skip ci]
Browse files Browse the repository at this point in the history
* Automated using myii/ssf-formula#92
  • Loading branch information
myii committed Nov 4, 2019
1 parent 5db2344 commit 37d2fc6
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ jobs:
## Define the rest of the matrix based on Kitchen testing
# Make sure the instances listed below match up with
# the `platforms` defined in `kitchen.yml`
# - env: INSTANCE=default-amazonlinux-1-master-py2
- env: INSTANCE=default-centos-8-master-py3
# - env: INSTANCE=default-fedora-31-master-py3
# - env: INSTANCE=default-amazonlinux-2-master-py2
Expand All @@ -58,9 +59,11 @@ jobs:
# - env: INSTANCE=default-fedora-31-2019-2-py3
- env: INSTANCE=default-amazonlinux-2-2019-2-py2
- env: INSTANCE=default-centos-7-2019-2-py2
# - env: INSTANCE=default-amazonlinux-1-2018-3-py2
# - env: INSTANCE=default-fedora-30-2018-3-py3
# - env: INSTANCE=default-centos-7-2018-3-py2
# - env: INSTANCE=default-amazonlinux-2-2018-3-py2
# - env: INSTANCE=default-amazonlinux-1-2017-7-py2
- env: INSTANCE=default-centos-6-2017-7-py2
# - env: INSTANCE=default-fedora-30-2017-7-py2
# - env: INSTANCE=default-amazonlinux-2-2017-7-py2
Expand Down
28 changes: 24 additions & 4 deletions kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ driver:
# the `env.matrix` instances defined in `.travis.yml`
platforms:
## SALT `master`
- name: amazonlinux-1-master-py2
driver:
image: amazonlinux:1
run_command: /sbin/init
provisioner:
salt_bootstrap_options: -XdPfq -x python2 git master
salt_install: bootstrap
- name: centos-8-master-py3
driver:
image: netmanagers/salt-master-py3:centos-8
Expand All @@ -37,11 +44,10 @@ platforms:
- name: amazonlinux-1-2019-2-py2
driver:
image: amazonlinux:1
platform: rhel
run_command: /sbin/init
provision_command:
# install latest stable Salt
- curl -L https://bootstrap.saltstack.com | sh -s -- -X
provisioner:
salt_bootstrap_options: -XdPfq -x python2 git 2019.2
salt_install: bootstrap
- name: centos-8-2019-2-py3
driver:
image: netmanagers/salt-2019.2-py3:centos-8
Expand All @@ -56,6 +62,13 @@ platforms:
image: netmanagers/salt-2019.2-py2:centos-7

## SALT `2018.3`
- name: amazonlinux-1-2018-3-py2
driver:
image: amazonlinux:1
run_command: /sbin/init
provisioner:
salt_bootstrap_options: -XdPfq -x python2 git 2018.3
salt_install: bootstrap
- name: fedora-30-2018-3-py3
driver:
image: netmanagers/salt-2018.3-py3:fedora-30
Expand All @@ -67,6 +80,13 @@ platforms:
image: netmanagers/salt-2018.3-py2:amazonlinux-2

## SALT `2017.7`
- name: amazonlinux-1-2017-7-py2
driver:
image: amazonlinux:1
run_command: /sbin/init
provisioner:
salt_bootstrap_options: -XdPfq -x python2 git 2017.7
salt_install: bootstrap
- name: centos-6-2017-7-py2
driver:
image: netmanagers/salt-2017.7-py2:centos-6
Expand Down

0 comments on commit 37d2fc6

Please sign in to comment.