From 37f0adfc826461b2522cd0e5852c27a408543f41 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 5 May 2020 16:02:31 +0100 Subject: [PATCH] ci(kitchen+travis): adjust matrix to use `3000.2` instead of `3000.1` --- .travis.yml | 13 ++++++++----- kitchen.yml | 10 +++++----- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index f098e13..b1318c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,11 +55,14 @@ jobs: @commitlint/travis-cli - commitlint-travis - - env: INSTANCE=api-debian-10-3000-1-py3 - - env: INSTANCE=workbench-debian-10-3000-1-py3 - - env: INSTANCE=shell-debian-10-3000-1-py3 - - env: INSTANCE=keepstore-debian-10-3000-1-py3 - # - env: INSTANCE=default-ubuntu-1804-3000-1-py3 + ## Define the rest of the matrix based on Kitchen testing + # Make sure the instances listed below match up with + # the `platforms` defined in `kitchen.yml` + - env: INSTANCE=api-debian-10-3000-2-py3 + - env: INSTANCE=workbench-debian-10-3000-2-py3 + - env: INSTANCE=shell-debian-10-3000-2-py3 + - env: INSTANCE=keepstore-debian-10-3000-2-py3 + # - env: INSTANCE=default-ubuntu-1804-3000-2-py3 # - env: INSTANCE=default-centos-7-2019-2-py3 ## Define the release stage that runs `semantic-release` diff --git a/kitchen.yml b/kitchen.yml index 7d10585..e7cec4e 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -11,14 +11,14 @@ driver: # Make sure the platforms listed below match up with # the `env.matrix` instances defined in `.travis.yml` platforms: - ## SALT `3000.1` - - name: debian-10-3000-1-py3 + ## SALT `3000.2` + - name: debian-10-3000-2-py3 driver: - image: netmanagers/salt-3000.1-py3:debian-10 + image: netmanagers/salt-3000.2-py3:debian-10 -# - name: ubuntu-1804-3000-1-py3 +# - name: ubuntu-1804-3000-2-py3 # driver: -# image: netmanagers/salt-3000.1-py3:ubuntu-18.04 +# image: netmanagers/salt-3000.2-py3:ubuntu-18.04 # ## SALT `2019.2` # - name: centos-7-2019-2-py3 -- 2.30.2