commit 523fd64deac7f90eeb69b5c0b305d8caeee5e0aa
author Oleh Hryhorov <ohryhorov@mirantis.com> Fri Jan 19 18:38:26 2018 +0200
committer Oleh Hryhorov <ohryhorov@mirantis.com> Mon Jan 22 15:54:15 2018 +0200
tree dede9f8ea8a6f32f187e1231df34a7c96e155aa9
parent d293a696e510566f131781c3da379ccc7ce7ab2e

Deleting deprecated function and switch test to 2017.7

The patch deletes deprecated cmd.run function which actually
was defined in salt 2016 as alias for cmd.shell therefore this
change supports backward compatibility.

Change-Id: I3fcf06eb259306e3fb5b748a6087624aa52e52dc
Related-PROD: 17056

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index da050d9..bdbd54e 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -8,7 +8,7 @@
   name: salt_solo
   salt_install: bootstrap
   salt_bootstrap_url: https://bootstrap.saltstack.com
-  salt_version: latest
+  salt_version: <%=ENV['SALT_VERSION'] || 'latest'%>
   require_chef: false
   log_level: error
   formula: neutron

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index ee25926..f045b94 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,44 @@
   - bundle install
 
 env:
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=compute-dpdk
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=compute-dpdk
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=compute-dvr
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=compute-dvr
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=compute-dvr-fwaas-v1
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=compute-legacy
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=compute-legacy
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=compute-nonexternal-dvr
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=compute-nonexternal-dvr
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=compute-sriov
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=compute-sriov
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=compute-qos-sriov
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=compute-qos-sriov
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=compute-qos
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=compute-qos
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=compute-ovn
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=control-cluster
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=control-cluster
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=control-dvr
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=control-dvr
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=control-nodvr
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=control-nodvr
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=control-single
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=control-single
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=control-lbaas-octavia
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=control-fwaas-v1
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=control-qos
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=control-qos
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=control-ovn
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=control-dns
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=control-dns
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=gateway-dvr
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=gateway-dvr
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=gateway-legacy
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=gateway-legacy
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=gateway-qos
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=gateway-qos
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=gateway-legacy-fwaas-v1
     - PLATFORM=trevorj/salty-whales:trusty SUITE=compute-dpdk
     - PLATFORM=trevorj/salty-whales:xenial SUITE=compute-dpdk
     - PLATFORM=trevorj/salty-whales:trusty SUITE=compute-dvr
@@ -55,7 +93,6 @@
     - PLATFORM=trevorj/salty-whales:trusty SUITE=gateway-qos
     - PLATFORM=trevorj/salty-whales:xenial SUITE=gateway-qos
     - PLATFORM=trevorj/salty-whales:xenial SUITE=gateway-legacy-fwaas-v1
-
 before_script:
   - set -o pipefail
   - make test | tail

neutron/meta/sphinx.yml

diff --git a/neutron/meta/sphinx.yml b/neutron/meta/sphinx.yml
index 20af434..f655e76 100644
--- a/neutron/meta/sphinx.yml
+++ b/neutron/meta/sphinx.yml
@@ -36,6 +36,6 @@
           value: |
             {%- for pkg in server.pkgs %}
             {%- set pkg_version = "dpkg -l "+pkg+" | grep "+pkg+" | awk '{print $3}'" %}
-            * {{ pkg }}: {{ salt['cmd.run'](pkg_version) }}
+            * {{ pkg }}: {{ salt['cmd.shell'](pkg_version) }}
             {%- endfor %}
   {%- endif %}