From 90e922f4d665ea66a6d4232fb99900d5402070e2 Mon Sep 17 00:00:00 2001
From: Boris Pavlovic <bpavlovic@godaddy.com>
Date: Fri, 29 Sep 2017 14:30:25 -0700
Subject: [PATCH] Do not use shebang in rally legacy jobs

Now they are exucted by ansible so we should set explictly
executable and run set -e and set -x inside the script

Change-Id: I504d49e469271b91394491333331a07ea365e52b
---
 .../legacy/rally-dsvm-certification-with-keystone-v3/run.yaml | 4 +++-
 playbooks/legacy/rally-dsvm-cli/run.yaml                      | 4 +++-
 .../legacy/rally-dsvm-verify-full-create-resources/run.yaml   | 4 +++-
 .../legacy/rally-dsvm-verify-full-discover-resources/run.yaml | 4 +++-
 .../legacy/rally-dsvm-verify-light-create-resources/run.yaml  | 4 +++-
 .../rally-dsvm-verify-light-discover-resources/run.yaml       | 4 +++-
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/playbooks/legacy/rally-dsvm-certification-with-keystone-v3/run.yaml b/playbooks/legacy/rally-dsvm-certification-with-keystone-v3/run.yaml
index 3ee44330..f034b675 100644
--- a/playbooks/legacy/rally-dsvm-certification-with-keystone-v3/run.yaml
+++ b/playbooks/legacy/rally-dsvm-certification-with-keystone-v3/run.yaml
@@ -25,8 +25,10 @@
       environment: '{{ zuul | zuul_legacy_vars }}'
 
     - shell:
+        executable: /bin/bash
         cmd: |
-          #/bin/bash -xe
+          set -e
+          set -x
 
           if [ $ZUUL_PROJECT == "openstack/rally" ] && [ $ZUUL_BRANCH != "master" ]; then
               export DEVSTACK_GATE_FEATURE_MATRIX="/opt/stack/new/rally/devstack/features.yaml"
diff --git a/playbooks/legacy/rally-dsvm-cli/run.yaml b/playbooks/legacy/rally-dsvm-cli/run.yaml
index ab2d4f17..f3336f2b 100644
--- a/playbooks/legacy/rally-dsvm-cli/run.yaml
+++ b/playbooks/legacy/rally-dsvm-cli/run.yaml
@@ -38,8 +38,10 @@
       environment: '{{ zuul | zuul_legacy_vars }}'
 
     - shell:
+        executable: /bin/bash
         cmd: |
-          #/bin/bash -xe
+          set -e
+          set -x
 
           if [ $ZUUL_PROJECT == "openstack/rally" ] && [ $ZUUL_BRANCH != "master" ]; then
               export DEVSTACK_GATE_FEATURE_MATRIX="/opt/stack/new/rally/devstack/features.yaml"
diff --git a/playbooks/legacy/rally-dsvm-verify-full-create-resources/run.yaml b/playbooks/legacy/rally-dsvm-verify-full-create-resources/run.yaml
index cf589f6e..6f66b8e2 100644
--- a/playbooks/legacy/rally-dsvm-verify-full-create-resources/run.yaml
+++ b/playbooks/legacy/rally-dsvm-verify-full-create-resources/run.yaml
@@ -25,8 +25,10 @@
       environment: '{{ zuul | zuul_legacy_vars }}'
 
     - shell:
+        executable: /bin/bash
         cmd: |
-          #/bin/bash -xe
+          set -e
+          set -x
 
           if [ $ZUUL_PROJECT == "openstack/rally" ] && [ $ZUUL_BRANCH != "master" ]; then
               export DEVSTACK_GATE_FEATURE_MATRIX="/opt/stack/new/rally/devstack/features.yaml"
diff --git a/playbooks/legacy/rally-dsvm-verify-full-discover-resources/run.yaml b/playbooks/legacy/rally-dsvm-verify-full-discover-resources/run.yaml
index 393f9fb4..a780a029 100644
--- a/playbooks/legacy/rally-dsvm-verify-full-discover-resources/run.yaml
+++ b/playbooks/legacy/rally-dsvm-verify-full-discover-resources/run.yaml
@@ -25,8 +25,10 @@
       environment: '{{ zuul | zuul_legacy_vars }}'
 
     - shell:
+        executable: /bin/bash
         cmd: |
-          #/bin/bash -xe
+          set -e
+          set -x
 
           if [ $ZUUL_PROJECT == "openstack/rally" ] && [ $ZUUL_BRANCH != "master" ]; then
               export DEVSTACK_GATE_FEATURE_MATRIX="/opt/stack/new/rally/devstack/features.yaml"
diff --git a/playbooks/legacy/rally-dsvm-verify-light-create-resources/run.yaml b/playbooks/legacy/rally-dsvm-verify-light-create-resources/run.yaml
index 2a65a4cf..7ff68875 100644
--- a/playbooks/legacy/rally-dsvm-verify-light-create-resources/run.yaml
+++ b/playbooks/legacy/rally-dsvm-verify-light-create-resources/run.yaml
@@ -25,8 +25,10 @@
       environment: '{{ zuul | zuul_legacy_vars }}'
 
     - shell:
+        executable: /bin/bash
         cmd: |
-          #/bin/bash -xe
+          set -e
+          set -x
 
           if [ $ZUUL_PROJECT == "openstack/rally" ] && [ $ZUUL_BRANCH != "master" ]; then
               export DEVSTACK_GATE_FEATURE_MATRIX="/opt/stack/new/rally/devstack/features.yaml"
diff --git a/playbooks/legacy/rally-dsvm-verify-light-discover-resources/run.yaml b/playbooks/legacy/rally-dsvm-verify-light-discover-resources/run.yaml
index ebbac403..6007a966 100644
--- a/playbooks/legacy/rally-dsvm-verify-light-discover-resources/run.yaml
+++ b/playbooks/legacy/rally-dsvm-verify-light-discover-resources/run.yaml
@@ -25,8 +25,10 @@
       environment: '{{ zuul | zuul_legacy_vars }}'
 
     - shell:
+        executable: /bin/bash
         cmd: |
-          #/bin/bash -xe
+          set -e
+          set -x
 
           if [ $ZUUL_PROJECT == "openstack/rally" ] && [ $ZUUL_BRANCH != "master" ]; then
               export DEVSTACK_GATE_FEATURE_MATRIX="/opt/stack/new/rally/devstack/features.yaml"