From a8834e22da134fddb0063e789d12254c8723a96e Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 19 May 2019 20:31:22 +0100 Subject: [PATCH 1/2] ci(travis): reduce matrix down to 6 instances (ref: #118) * The selected 6 in a "tree"-shaped matrix: - 2019.2 (py3): debian-9 centos7 opensuse-leap-15 - 2018.3 (py2): fedora-29 ubuntu-1604 - 2017.7 (py2): centos6 * Covers each `os`, each Salt version and both Python versions --- .travis.yml | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 09e5f7dd..af6018b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,27 +13,33 @@ services: # Make sure the instances listed below match up with # the `platforms` defined in `kitchen.yml` +# NOTE: To minimise disruption across the whole org, only select five instances +# to run and leave the rest commented out +# The recommended matrix is shown below +# Allow `kitchen.yml` to contain all of the platforms, to allow +# comprehensive local testing +# Ref: https://github.com/saltstack-formulas/template-formula/issues/118 env: matrix: - 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-py3 - - INSTANCE: default-fedora-29-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-debian-9-2018-3-py2 - INSTANCE: default-ubuntu-1604-2018-3-py2 - - INSTANCE: default-centos-7-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 + # - 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 + # - INSTANCE: default-fedora-28-2017-7-py2 + # - INSTANCE: default-opensuse-leap-42-2017-7-py2 script: - bundle exec kitchen verify ${INSTANCE} From b08a0fdd71adcc1aec742e6199c84942e9cdddfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20B=C3=A9rtoli?= Date: Wed, 22 May 2019 13:15:31 +0100 Subject: [PATCH 2/2] ci(travis): improve recommended matrix usage comment --- .travis.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index af6018b0..588016be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,12 +13,17 @@ services: # Make sure the instances listed below match up with # the `platforms` defined in `kitchen.yml` -# NOTE: To minimise disruption across the whole org, only select five instances -# to run and leave the rest commented out -# The recommended matrix is shown below -# Allow `kitchen.yml` to contain all of the platforms, to allow -# comprehensive local testing +# NOTE: Please try to select up to six instances that add some meaningful +# testing of the formula's behaviour. If possible, try to refrain from +# the classical "chosing all the instances because I want to test on +# another/all distro/s" trap: it will just add time to the testing (see +# the discussion on #121). As an example, the set chosen below covers +# the most used distros families, systemd and non-systemd and the latest +# three supported Saltstack versions with python2 and 3." +# As for `kitchen.yml`, that should still contain all of the platforms, +# to allow for comprehensive local testing # Ref: https://github.com/saltstack-formulas/template-formula/issues/118 +# Ref: https://github.com/saltstack-formulas/template-formula/issues/121 env: matrix: - INSTANCE: default-debian-9-2019-2-py3