Browse Source

Remove Salt deprecations and switch tests to Salt 2017.7

Change-Id: If96f95fdab13eae187a843f81b0d0060339a5f98
atp-proxy
Martin Polreich 7 years ago
parent
commit
72f61c4e34
4 changed files with 11 additions and 3 deletions
  1. +2
    -2
      .kitchen.yml
  2. +7
    -0
      .travis.yml
  3. +1
    -1
      linux/files/multipath.conf
  4. +1
    -0
      tests/pillar/system.sls

+ 2
- 2
.kitchen.yml View File

sudo: true sudo: true


platforms: platforms:
- name: <%=ENV['PLATFORM'] || 'ubuntu-xenial'%>
- name: <%=ENV['PLATFORM'] || 'ubuntu-xenial-2017.7'%>
driver_config: driver_config:
image: <%=ENV['PLATFORM'] || 'trevorj/salty-whales:xenial'%>
image: <%=ENV['PLATFORM'] || 'trevorj/salty-whales:xenial-2017.7'%>
platform: ubuntu platform: ubuntu





+ 7
- 0
.travis.yml View File

- bundle install - bundle install


env: env:
- PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=network
- PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=network
# - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=storage
# - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=storage
- PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=system
- PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=system
- PLATFORM=trevorj/salty-whales:trusty SUITE=network - PLATFORM=trevorj/salty-whales:trusty SUITE=network
- PLATFORM=trevorj/salty-whales:xenial SUITE=network - PLATFORM=trevorj/salty-whales:xenial SUITE=network
# - PLATFORM=trevorj/salty-whales:trusty SUITE=storage # - PLATFORM=trevorj/salty-whales:trusty SUITE=storage
# - PLATFORM=trevorj/salty-whales:xenial SUITE=storage # - PLATFORM=trevorj/salty-whales:xenial SUITE=storage
- PLATFORM=trevorj/salty-whales:trusty SUITE=system - PLATFORM=trevorj/salty-whales:trusty SUITE=system
- PLATFORM=trevorj/salty-whales:xenial SUITE=system - PLATFORM=trevorj/salty-whales:xenial SUITE=system
## Test on both Salt version until there is new test policy accepted


before_script: before_script:
- set -o pipefail - set -o pipefail

+ 1
- 1
linux/files/multipath.conf View File



blacklist { blacklist {
{%- for device in storage.multipath.get('blacklist_devices', []) %} {%- for device in storage.multipath.get('blacklist_devices', []) %}
wwid {{ salt['cmd.run']('/lib/udev/scsi_id -g -u '+device) }}
wwid {{ salt['cmd.shell']('/lib/udev/scsi_id -g -u '+device) }}
{%- endfor %} {%- endfor %}
devnode "^(ram|raw|loop|fd|md|dm-|sr|scd|st|nbd)[0-9]*" devnode "^(ram|raw|loop|fd|md|dm-|sr|scd|st|nbd)[0-9]*"
} }

+ 1
- 0
tests/pillar/system.sls View File

testuser: testuser:
enabled: true enabled: true
name: testuser name: testuser
password: passw0rd
sudo: true sudo: true
uid: 9999 uid: 9999
full_name: Test User full_name: Test User

Loading…
Cancel
Save