commit ee916d9525f454c1a6655bbd76d92b14c130078c
author Martin Polreich <polreichmartin@gmail.com> Tue Oct 15 14:30:00 2019 +0200
committer Martin Polreich <polreichmartin@gmail.com> Fri Nov 08 11:17:32 2019 +0100
tree 6afbc4cebe6a16a070de96ccb4f5273b5358b4ff
parent 1c940c790078406ac39796679a86ff5ea8685a06

Formulas testing revision 2019/10

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

Change-Id: I1d6114f76a544b751f3b60e948b25d0b8d79fd21

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 2919a16..eac348e 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -18,11 +18,11 @@
     - name: linux
       repo: git
       source: https://gerrit.mcp.mirantis.com/salt-formulas/linux
-      branch: <%=ENV['GERRIT_BRANCH'] || 'master' %>
+      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'] || 'master' %>
+      branch: <%=ENV['GERRIT_BRANCH'] || 'release/2019.2.0' %>
   state_top:
     base:
       "*":
@@ -40,8 +40,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
@@ -49,13 +48,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: api_single_<%=os_version%>
     provisioner:
       pillars-from-files: