From 6187515e4395349448c6d0b4519c9037197a1a88 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 30 Oct 2019 04:45:22 +0000 Subject: [PATCH] ci(kitchen+travis): upgrade matrix after `2019.2.2` release [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/86 --- .travis.yml | 8 ++++---- kitchen.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 64e0b63..4630e86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ jobs: script: # Install and run `salt-lint` - pip install --user salt-lint - - git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$' + - git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$\|\.tst$' | xargs -I {} salt-lint {} # Install and run `yamllint` # Need at least `v1.17.0` for the `yaml-files` setting @@ -51,9 +51,9 @@ jobs: # Make sure the instances listed below match up with # the `platforms` defined in `kitchen.yml` - env: INSTANCE=repositories-debian-10-master-py3 - # - env: INSTANCE=preferences-debian-10-master-py3 - # - env: INSTANCE=repositories-ubuntu-1804-develop-py3 - # - env: INSTANCE=preferences-ubuntu-1804-develop-py3 + - env: INSTANCE=preferences-debian-10-master-py3 + # - env: INSTANCE=repositories-ubuntu-1804-master-py3 + # - env: INSTANCE=preferences-ubuntu-1804-master-py3 - env: INSTANCE=repositories-debian-9-2019-2-py3 - env: INSTANCE=preferences-debian-9-2019-2-py3 - env: INSTANCE=repositories-ubuntu-1804-2019-2-py3 diff --git a/kitchen.yml b/kitchen.yml index f566471..8d44ff7 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -11,19 +11,19 @@ driver: # Make sure the platforms listed below match up with # the `env.matrix` instances defined in `.travis.yml` platforms: - ## SALT `develop` => `master` + ## SALT `master` - name: debian-10-master-py3 driver: image: netmanagers/salt-master-py3:debian-10 provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - sh bootstrap-salt.sh -XdPbfrq -x python3 git master - - name: ubuntu-1804-develop-py3 + - name: ubuntu-1804-master-py3 driver: - image: netmanagers/salt-develop-py3:ubuntu-18.04 + image: netmanagers/salt-master-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 + - sh bootstrap-salt.sh -XdPbfrq -x python3 git master ## SALT `2019.2` - name: debian-9-2019-2-py3