瀏覽代碼

Merge "Use new image for kitchen tests"

master
Petr Michalec 6 年之前
父節點
當前提交
33df4d643a
共有 2 個檔案被更改,包括 5 行新增4 行删除
  1. +2
    -2
      .kitchen.yml
  2. +3
    -2
      .travis.yml

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

@@ -29,9 +29,9 @@ verifier:
sudo: true

platforms:
- name: <%=ENV['PLATFORM'] || 'ubuntu-xenial'%>
- name: <%=ENV['PLATFORM'] || 'saltstack-ubuntu-xenial-salt-stable' %>
driver_config:
image: <%=ENV['PLATFORM'] || 'trevorj/salty-whales:xenial'%>
image: <%=ENV['PLATFORM'] || 'epcim/salt-formulas:saltstack-ubuntu-xenial-salt-stable'%>
platform: ubuntu

suites:

+ 3
- 2
.travis.yml 查看文件

@@ -17,8 +17,9 @@ install:
- bundle install

env:
- PLATFORM=trevorj/salty-whales:trusty SUITE=iptables-server
- PLATFORM=trevorj/salty-whales:xenial SUITE=iptables-server
- PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=iptables-server
- PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=iptables-server
# - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=iptables-server

before_script:
- set -o pipefail

Loading…
取消
儲存