Switch to newest test docker image
Make sure kitchen test dependencies formulas are always fetched from correct branch
Related: PROD-29821
Related: PROD-29251
Fixes: PROD-29819
Enables: https://gerrit.mcp.mirantis.com/#/c/39637/
(cherry picked from commit 55e4d4ba463f327bbc79b16357e6bfbe51c4fe47)
(cherry picked from commit dcc2a880c9045c890463cc606d0b948addd6b52f)
(cherry picked from commit 928bd870114815288b8fed1bf3d80944e2cd86c3)
Change-Id: Ic06787f931ecc295a8817e29ae0a1f194a882b26
diff --git a/.kitchen.yml b/.kitchen.yml
index 264da98..ece2c75 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -37,15 +37,15 @@
- name: linux
repo: git
source: https://gerrit.mcp.mirantis.com/salt-formulas/linux.git
+ branch: <%=ENV['GERRIT_BRANCH'] || 'master' %>
verifier:
name: inspec
sudo: true
docker_images:
- - &xenial-20163 <%=ENV['IMAGE_XENIAL_20163'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19'%>
- - &xenial-20177 <%=ENV['IMAGE_XENIAL_20177'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19'%>
- - &xenial-stable <%=ENV['IMAGE_XENIAL_STABLE'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19'%>
+ - &xenial-20177 <%=ENV['IMAGE_XENIAL_20177'] || 'docker-dev-local.docker.mirantis.net/mirantis/drivetrain/salt-formulas-ci/salt-formulas-ci-xenial-2017.7:latest'%>
+ - &xenial-20183 <%=ENV['IMAGE_XENIAL_20183'] || 'docker-dev-local.docker.mirantis.net/mirantis/drivetrain/salt-formulas-ci/salt-formulas-ci-xenial-2018.3:latest'%>
platforms:
- name: xenial-2017.7
@@ -53,9 +53,9 @@
image: *xenial-20177
platform: ubuntu
- - name: xenial-stable
+ - name: xenial-2018.3
driver_config:
- image: *xenial-stable
+ image: *xenial-20183
platform: ubuntu
suites: