X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Felasticsearch.git;a=blobdiff_plain;f=.kitchen.yml;h=936c51f81d5136c7f15f84e65b66e3c88a2f7524;hp=110f8622a9a8f6e22dfd3d29c0771a1cff884931;hb=HEAD;hpb=8e3a8c223c26f6e73da04642977d565bf1f346ae diff --git a/.kitchen.yml b/.kitchen.yml index 110f862..936c51f 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -31,14 +31,14 @@ provisioner: - 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-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 @@ -46,11 +46,6 @@ platforms: image: *xenial-20177 platform: ubuntu - - name: xenial-stable - driver_config: - image: *xenial-stable - platform: ubuntu - suites: - name: single provisioner: