From d9e673659c3e79f219c2c6042494c9a1ae2f85f6 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 24 Oct 2019 18:13:03 +0100 Subject: [PATCH] ci(kitchen): use `debian-10-master-py3` instead of `develop` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/84 --- .travis.yml | 4 ++-- kitchen.yml | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1e6fd49..4d6d8be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,8 +50,8 @@ jobs: ## 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=default-debian-10-develop-py3 - - env: INSTANCE=clean-debian-10-develop-py3 + - env: INSTANCE=default-debian-10-master-py3 + - env: INSTANCE=clean-debian-10-master-py3 # - env: INSTANCE=default-ubuntu-1804-develop-py3 # - env: INSTANCE=default-centos-7-develop-py3 # - env: INSTANCE=default-fedora-30-develop-py3 diff --git a/kitchen.yml b/kitchen.yml index 7176686..03e41ef 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -11,13 +11,13 @@ driver: # Make sure the platforms listed below match up with # the `env.matrix` instances defined in `.travis.yml` platforms: - ## SALT `develop` - - name: debian-10-develop-py3 + ## SALT `develop` => `master` + - name: debian-10-master-py3 driver: - image: netmanagers/salt-develop-py3:debian-10 + 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 develop + - sh bootstrap-salt.sh -XdPbfrq -x python3 git master - name: ubuntu-1804-develop-py3 driver: image: netmanagers/salt-develop-py3:ubuntu-18.04 @@ -214,7 +214,7 @@ suites: - path: test/integration/default - name: clean includes: - - debian-10-develop-py3 + - debian-10-master-py3 provisioner: state_top: base: