commit 77a8af1c6c48c2dbfd6322322067e5500a669ae0
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Jan 18 16:27:39 2018 +0000
committer Gerrit Code Review <gerrit2@56fc70e46927> Thu Jan 18 16:27:39 2018 +0000
tree 703254480f7fc7a22dc19c01a02e4e2387c25239
parent f252bb21347a43c7d17262d2cd249582f2a69359
parent 459407bb303d49031a9e42c5a84eaf630bad73d8

Merge "SaltStack - Architect integration"

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index eed1da2..f10a26c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,16 +17,18 @@
   - bundle install
 
 env:
-  - PLATFORM=trevorj/salty-whales:trusty SUITE=minion-default
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=minion-default
-  - PLATFORM=trevorj/salty-whales:trusty SUITE=master-default
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=master-default
-  - PLATFORM=trevorj/salty-whales:trusty SUITE=minion-default
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=minion-default
+
   - PLATFORM=trevorj/salty-whales:trusty SUITE=control-default
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=control-default
+  - PLATFORM=trevorj/salty-whales:trusty SUITE=master-default
+  - PLATFORM=trevorj/salty-whales:trusty SUITE=minion-default
   - PLATFORM=trevorj/salty-whales:trusty SUITE=minion-multi-master-failover
+  - PLATFORM=trevorj/salty-whales:xenial SUITE=control-default
+  - PLATFORM=trevorj/salty-whales:xenial SUITE=master-default
+  - PLATFORM=trevorj/salty-whales:xenial SUITE=minion-default
   - PLATFORM=trevorj/salty-whales:xenial SUITE=minion-multi-master-failover
+# TODO, once 18.04 LTS Bionic Beaver is released, rename trusty to bionic
+  - PLATFORM=trevorj/salty-whales:bionic SUITE=master-default
+  - PLATFORM=trevorj/salty-whales:bionic SUITE=minion-default
 
 before_script:
   - set -o pipefail

salt/meta/sphinx.yml

diff --git a/salt/meta/sphinx.yml b/salt/meta/sphinx.yml
index 41df43c..2ae6452 100644
--- a/salt/meta/sphinx.yml
+++ b/salt/meta/sphinx.yml
@@ -8,7 +8,7 @@
       name: minion
       param:
         version:
-          value: {{ salt['cmd.run']('salt-minion --version')|replace('salt-minion ', '') }}
+          value: {{ salt['cmd.shell']('salt-minion --version')|replace('salt-minion ', '') }}
   {%- endif %}
   {%- if pillar.salt.master is defined %}
   {%- from "salt/map.jinja" import master with context %}
@@ -16,5 +16,5 @@
       name: master
       param:
         version:
-          value: {{ salt['cmd.run']('salt --version')|replace('salt ', '') }}
+          value: {{ salt['cmd.shell']('salt --version')|replace('salt ', '') }}
   {%- endif %}