Skip to content

Commit

Permalink
test(matrix): use opensuse15 (no py3 on cent6)
Browse files Browse the repository at this point in the history
  • Loading branch information
noelmcloughlin committed Jul 1, 2019
1 parent 06158d3 commit 26b126f
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ env:
- INSTANCE: default-ubuntu-1804-2019-2-py3
- INSTANCE: default-centos-7-2019-2-py3
# - INSTANCE: default-fedora-29-2019-2-py3
# - INSTANCE: default-opensuse-leap-15-2019-2-py3
- INSTANCE: default-opensuse-leap-15-2019-2-py3
# - INSTANCE: default-debian-9-2018-3-py2
# - INSTANCE: default-ubuntu-1604-2018-3-py2
# - INSTANCE: default-centos-7-2018-3-py2
Expand All @@ -47,9 +47,9 @@ env:
# - 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-centos-6-2017-7-py2
# - INSTANCE: default-fedora-28-2017-7-py2
# - INSTANCE: default-opensuse-leap-42-2017-7-py2
#- INSTANCE: default-opensuse-leap-42-2017-7-py2

script:
- bundle exec kitchen verify ${INSTANCE}
Expand Down
2 changes: 2 additions & 0 deletions deepsea/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ deepsea:
- jq
- pciutils
- salt-api
- tar
- gzip
use_upstream_repo: False
use_upstream_source: True
repo:
Expand Down
7 changes: 7 additions & 0 deletions kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ platforms:
provision_command:
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
- zypper -n in tar gzip
run_command: /usr/lib/systemd/systemd

## SALT 2019.2
Expand All @@ -62,6 +63,8 @@ platforms:
- name: opensuse-leap-15-2019-2-py3
driver:
image: netmanagers/salt-2019.2-py3:opensuse-leap-15
provision_command:
- zypper -n in tar gzip
run_command: /usr/lib/systemd/systemd

## SALT 2018.3
Expand All @@ -86,6 +89,8 @@ platforms:
- name: opensuse-leap-42-2018-3-py2
driver:
image: netmanagers/salt-2018.3-py2:opensuse-leap-42
provision_command:
- zypper -n in tar gzip
run_command: /usr/lib/systemd/systemd

## SALT 2017.7
Expand All @@ -106,6 +111,8 @@ platforms:
- name: opensuse-leap-42-2017-7-py2
driver:
image: netmanagers/salt-2017.7-py2:opensuse-leap-42
provision_command:
- zypper -n in tar gzip
run_command: /usr/lib/systemd/systemd

provisioner:
Expand Down

0 comments on commit 26b126f

Please sign in to comment.