From 2f74007e592ad51467a93a312c6ed41dfd46a1a0 Mon Sep 17 00:00:00 2001 From: Martin Polreich Date: Tue, 20 Nov 2018 15:07:42 +0100 Subject: [PATCH] Move to Mirantis owned docker images for tests - This is a temporary solution until we have our own images Fixes: PROD-24956 (PROD:24956) Change-Id: I854269a751a426d7a6925cb0a2046554e90e9d06 --- .kitchen.yml | 2 +- .travis.yml | 32 ++++++++++++-------------------- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/.kitchen.yml b/.kitchen.yml index 13a6764..396dd27 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -39,7 +39,7 @@ verifier: platforms: - name: <%=ENV['PLATFORM'] || 'saltstack-ubuntu-xenial-salt-stable' %> driver_config: - image: <%=ENV['PLATFORM'] || 'epcim/salt:saltstack-ubuntu-xenial-salt-stable'%> + image: <%=ENV['PLATFORM'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19'%> platform: ubuntu suites: diff --git a/.travis.yml b/.travis.yml index 624423f..c74699b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,26 +12,18 @@ install: - bundle install env: - - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=single - - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=cluster - - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=curator - - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=client - - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=single - - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=cluster - - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=curator - - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=client - - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=single - - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=cluster - - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=curator - - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=client -# - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=single -# - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=cluster -# - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=curator -# - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=client -# - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=single -# - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=cluster -# - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=curator -# - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=client + - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 SUITE=single + - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 SUITE=cluster + - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 SUITE=curator + - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 SUITE=client + - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=single + - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=cluster + - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=curator + - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=client + - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=single + - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=cluster + - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=curator + - PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=client before_script: - set -o pipefail -- 2.32.7