From f6b357d424953a0d48a283b819651e73467dab62 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 25 Jun 2019 22:52:40 +0100 Subject: [PATCH] ci(kitchen+travis): modify matrix to include `develop` platform * Use balanced matrix based on `template-formula` guidelines --- .travis.yml | 36 ++++++++++++------- kitchen.yml | 100 ++++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 96 insertions(+), 40 deletions(-) diff --git a/.travis.yml b/.travis.yml index b0b0917..0c5b206 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,23 +11,34 @@ language: ruby services: - docker -before_install: - - bundle install - # Make sure the instances listed below match up with # the `platforms` defined in `kitchen.yml` env: 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-centos-7-2019-2-py2 - - INSTANCE: default-fedora-29-2019-2-py2 - - INSTANCE: default-opensuse-423-2018-3-py2 - - INSTANCE: default-debian-8-2018-3-py2 - - INSTANCE: default-ubuntu-1604-2018-3-py2 - - INSTANCE: default-fedora-28-2018-3-py2 - - INSTANCE: default-debian-8-2017-7-py2 - - INSTANCE: default-ubuntu-1604-2017-7-py2 + - INSTANCE: default-centos-7-2019-2-py3 + # - INSTANCE: default-fedora-29-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 + - INSTANCE: default-fedora-29-2018-3-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: - bundle exec kitchen verify ${INSTANCE} @@ -64,4 +75,3 @@ jobs: script: # Run `semantic-release` - npx semantic-release@15 - diff --git a/kitchen.yml b/kitchen.yml index 2c949ca..3b42047 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -11,54 +11,100 @@ driver: # Make sure the platforms listed below match up with # the `env.matrix` instances defined in `.travis.yml` 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 - name: debian-9-2019-2-py3 driver: image: netmanagers/salt-2019.2-py3:debian-9 - name: ubuntu-1804-2019-2-py3 driver: - image: netmanagers/salt-2019.2-py3:ubuntu-1804 - - name: centos-7-2019-2-py2 + image: netmanagers/salt-2019.2-py3:ubuntu-18.04 + - name: centos-7-2019-2-py3 driver: - image: netmanagers/salt-2019.2-py2:centos-7 - - name: fedora-29-2019-2-py2 + image: netmanagers/salt-2019.2-py3:centos-7 + - name: fedora-29-2019-2-py3 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 - - name: opensuse-423-2018-3-py2 + - name: debian-9-2018-3-py2 driver: - image: netmanagers/salt-2018.3-py2:opensuse-423 - run_command: /usr/lib/systemd/systemd - - name: debian-8-2018-3-py2 - driver: - image: netmanagers/salt-2018.3-py2:debian-8 + image: netmanagers/salt-2018.3-py2:debian-9 - name: ubuntu-1604-2018-3-py2 driver: - image: netmanagers/salt-2018.3-py2:ubuntu-1604 - - name: fedora-28-2018-3-py2 + image: netmanagers/salt-2018.3-py2:ubuntu-16.04 + - name: centos-7-2018-3-py2 driver: - image: netmanagers/salt-2018.3-py2:fedora-28 - - # centos-6 guest fails on Debian hosts due to vsyscall issues, see - # https://hub.docker.com/_/centos, "A note about vsyscall" - # Disabled for `template-formula` because not `systemd` based - # - name: centos-6-2018-3 + image: netmanagers/salt-2018.3-py2:centos-7 + - name: fedora-29-2018-3-py2 + driver: + image: netmanagers/salt-2018.3-py2:fedora-29 + # TODO: Use this when fixed instead of `opensuse-leap-42` + # Ref: https://github.com/netmanagers/salt-image-builder/issues/2 + # - name: opensuse-leap-15-2018-3-py2 # driver: - # image: netmanagers/salt-2018.3-py2:centos-6 - # run_command: /sbin/init + # image: netmanagers/salt-2018.3-py2:opensuse-leap-15 + # 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 driver: image: netmanagers/salt-2017.7-py2:debian-8 - name: ubuntu-1604-2017-7-py2 driver: - image: netmanagers/salt-2017.7-py2:ubuntu-1604 - # - name: centos-6-2017-7 - # driver: - # image: netmanagers/salt-2017.7-py2:centos-6 - # run_command: /sbin/init + image: netmanagers/salt-2017.7-py2:ubuntu-16.04 + # TODO: Modify the formula to work for non-`systemd` platforms + - name: centos-6-2017-7-py2 + driver: + 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: name: salt_solo