commit e75eadf143f9814310986a83b77f800b1b30b606
author Martin Polreich <polreichmartin@gmail.com> Mon Oct 07 16:36:48 2019 +0200
committer Martin Polreich <polreichmartin@gmail.com> Thu Nov 07 21:36:59 2019 +0100
tree af1f15a1ff752d6df68e1448bdaf30d3f50f7ea5
parent e46a06828ee7b3871bcd6facc52c976f2dee4ea4

Formulas testing revision 2019/10

Related: PROD-32744
Related: PROD-33633
Related: PROD-33634
Related: PROD-33698
Related: PROD-33984

Change-Id: I0234d779b2844aaebbfa843329f24a770b2fb821

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 79bda71..fcb455a 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -18,9 +18,11 @@
     - name: apache
       repo: git
       source: https://gerrit.mcp.mirantis.com/salt-formulas/apache
+      branch: <%=ENV['GERRIT_BRANCH'] || 'release/2019.2.0' %>
     - name: oslo_templates
       repo: git
       source: https://gerrit.mcp.mirantis.com/salt-formulas/oslo-templates
+      branch: <%=ENV['GERRIT_BRANCH'] || 'release/2019.2.0' %>
   state_top:
     base:
       "*":
@@ -150,8 +152,7 @@
   sudo: true
 
 docker_images:
-  - &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'%>
 
 platforms:
   - name: xenial-2017.7
@@ -159,13 +160,8 @@
       image: *xenial-20177
       platform: ubuntu
 
-  - name: xenial-stable
-    driver_config:
-      image: *xenial-stable
-      platform: ubuntu
-
 suites:
-<% for os_version in ['ocata','pike', 'queens'] %>
+<% for os_version in ['pike', 'queens'] %>
   - name: control_single_<%=os_version%>
     provisioner:
       pillars-from-files: