summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-10 05:43:53 +0000
committerGerrit Code Review <review@openstack.org>2019-01-10 05:43:53 +0000
commit907c1f999d2acb61de0c1f9d39a751121a93e7e1 (patch)
tree4dc2b4c21a20b7d3d8955af8147a1f9fc9dc4503
parent4100be27befd3fbca38ad82d95aaacd5a81898f6 (diff)
parent591fd44300a617d1646408c621e8f1ec5f03216b (diff)
Merge "Enable process_stackviz function to be optional"
-rwxr-xr-xdevstack-vm-gate-wrap.sh3
-rw-r--r--functions.sh4
2 files changed, 6 insertions, 1 deletions
diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index a2dce9c..1a67dda 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -31,6 +31,9 @@ GIT_BRANCH=${GIT_BRANCH:-master}
31ANSIBLE_VERSION=${ANSIBLE_VERSION:-2.5.7} 31ANSIBLE_VERSION=${ANSIBLE_VERSION:-2.5.7}
32export DSTOOLS_VERSION=${DSTOOLS_VERSION:-0.4.0} 32export DSTOOLS_VERSION=${DSTOOLS_VERSION:-0.4.0}
33 33
34# Set to 0 to skip stackviz
35export PROCESS_STACKVIZ=${PROCESS_STACKVIZ:-1}
36
34# sshd may have been compiled with a default path excluding */sbin 37# sshd may have been compiled with a default path excluding */sbin
35export PATH=$PATH:/usr/local/sbin:/usr/sbin 38export PATH=$PATH:/usr/local/sbin:/usr/sbin
36# When doing xtrace (set -x / set -o xtrace), provide more debug output 39# When doing xtrace (set -x / set -o xtrace), provide more debug output
diff --git a/functions.sh b/functions.sh
index bc478b9..a0c14f9 100644
--- a/functions.sh
+++ b/functions.sh
@@ -841,7 +841,9 @@ function cleanup_host {
841 sudo mv $WORKSPACE/rpm-qa.txt.gz $BASE/logs/ 841 sudo mv $WORKSPACE/rpm-qa.txt.gz $BASE/logs/
842 fi 842 fi
843 843
844 process_stackviz tempest 844 if [[ "$PROCESS_STACKVIZ" -eq "1" ]] ; then
845 process_stackviz tempest
846 fi
845 847
846 process_testr_artifacts tempest 848 process_testr_artifacts tempest
847 process_testr_artifacts tempest old 849 process_testr_artifacts tempest old