瀏覽代碼

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: I4b81950abd5c31f95ab92c972192db0239069e72
pull/78/merge
Martin Polreich 6 年之前
父節點
當前提交
ca20bd6aa6
共有 2 個檔案被更改,包括 13 行新增21 行删除
  1. +1
    -1
      .kitchen.yml
  2. +12
    -20
      .travis.yml

+ 1
- 1
.kitchen.yml 查看文件

@@ -61,7 +61,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:

+ 12
- 20
.travis.yml 查看文件

@@ -15,26 +15,18 @@ install:
- bundle install

env:
- PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=control-default
- PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=master-default
- PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=minion-default
- PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=minion-multi-master-failover
- PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=control-default
- PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=master-default
- PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=minion-default
- PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=minion-multi-master-failover
- PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=control-default
- PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=master-default
- PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=minion-default
- PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=minion-multi-master-failover
# - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=control-default
# - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=master-default
# - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=minion-default
# - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=minion-multi-master-failover
# - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=control-default
# - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=master-default
# - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=minion-default
# - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=minion-multi-master-failover
- PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 SUITE=control-default
- PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 SUITE=master-default
- PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 SUITE=minion-default
- PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2016.3/salt:2018_11_19 SUITE=minion-multi-master-failover
- PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=control-default
- PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=master-default
- PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=minion-default
- PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19 SUITE=minion-multi-master-failover
- PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=control-default
- PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=master-default
- PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=minion-default
- PLATFORM=docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19 SUITE=minion-multi-master-failover

before_script:
- set -o pipefail

Loading…
取消
儲存