commit b25b17ab41609ad054ae47545fcc8d697838cebf
author Oleh Hryhorov <ohryhorov@mirantis.com> Mon Jan 22 12:14:30 2018 +0200
committer Oleh Hryhorov <ohryhorov@mirantis.com> Mon Jan 22 15:47:05 2018 +0200
tree 1980b22e2f851bf24af44c431cfc03cabcffa528
parent 4ec445014d5a1fdb7849803e492ab567fb78b766

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: I0de61b64d4c6b9fd8926cc9ce8fe7566153fe451
Related-PROD: 17056

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 01c5fda..0c77d2e 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: cinder

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 4f20546..07f3508 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,28 @@
   - bundle install
 
 env:
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 OS_VERSION=mitaka SUITE=ceph-single
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 OS_VERSION=ocata SUITE=ceph-single
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 OS_VERSION=mitaka SUITE=control-cluster
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 OS_VERSION=ocata SUITE=control-cluster
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 OS_VERSION=mitaka SUITE=control-single
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 OS_VERSION=ocata SUITE=control-single
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 OS_VERSION=mitaka SUITE=gpfs-single
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 OS_VERSION=ocata SUITE=gpfs-single
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 OS_VERSION=mitaka SUITE=hp3par-single
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 OS_VERSION=ocata SUITE=hp3par-single
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 OS_VERSION=mitaka SUITE=lefthand-single
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 OS_VERSION=ocata SUITE=lefthand-single
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 OS_VERSION=mitaka SUITE=solidfire-single
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 OS_VERSION=ocata SUITE=solidfire-single
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 OS_VERSION=mitaka SUITE=storwize-single
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 OS_VERSION=ocata SUITE=storwize-single
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 OS_VERSION=mitaka SUITE=volume-single
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 OS_VERSION=ocata SUITE=volume-single
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 OS_VERSION=mitaka SUITE=vsp-single
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 OS_VERSION=ocata SUITE=vsp-single
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 OS_VERSION=mitaka SUITE=volume-single-barbican
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 OS_VERSION=ocata SUITE=volume-single-barbican
     - PLATFORM=trevorj/salty-whales:trusty OS_VERSION=mitaka SUITE=ceph-single
     - PLATFORM=trevorj/salty-whales:xenial OS_VERSION=ocata SUITE=ceph-single
     - PLATFORM=trevorj/salty-whales:trusty OS_VERSION=mitaka SUITE=control-cluster
@@ -37,8 +59,8 @@
     - PLATFORM=trevorj/salty-whales:xenial OS_VERSION=ocata SUITE=volume-single
     - PLATFORM=trevorj/salty-whales:trusty OS_VERSION=mitaka SUITE=vsp-single
     - PLATFORM=trevorj/salty-whales:xenial OS_VERSION=ocata SUITE=vsp-single
-    - PLATFORM=trevorj/salty-whales:trusty OS_VERSION=mitaka SUITE=volume-single-barbican
-    - PLATFORM=trevorj/salty-whales:xenial OS_VERSION=ocata SUITE=volume-single-barbican
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 OS_VERSION=mitaka SUITE=volume-single-barbican
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 OS_VERSION=ocata SUITE=volume-single-barbican
 
 before_script:
   - set -o pipefail

cinder/meta/sphinx.yml

diff --git a/cinder/meta/sphinx.yml b/cinder/meta/sphinx.yml
index eebde48..f326ee9 100644
--- a/cinder/meta/sphinx.yml
+++ b/cinder/meta/sphinx.yml
@@ -34,7 +34,7 @@
           value: |
             {%- for pkg in controller.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 %}
         {%- if controller.backend is defined %}
         backends:
@@ -75,7 +75,7 @@
           value: |
             {%- for pkg in volume.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 %}
         {%- if volume.backend is defined %}
         backends: