From 26b126f3e5957164c6ff9a1b89584e3649f880c7 Mon Sep 17 00:00:00 2001 From: N Date: Mon, 1 Jul 2019 19:36:13 +0100 Subject: [PATCH] test(matrix): use opensuse15 (no py3 on cent6) --- .travis.yml | 6 +++--- deepsea/defaults.yaml | 2 ++ kitchen.yml | 7 +++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 476d64e..dd55e9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 @@ -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} diff --git a/deepsea/defaults.yaml b/deepsea/defaults.yaml index 22c6d1a..8cfe34b 100644 --- a/deepsea/defaults.yaml +++ b/deepsea/defaults.yaml @@ -11,6 +11,8 @@ deepsea: - jq - pciutils - salt-api + - tar + - gzip use_upstream_repo: False use_upstream_source: True repo: diff --git a/kitchen.yml b/kitchen.yml index e083b02..25a2abc 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -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 @@ -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 @@ -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 @@ -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: