summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-05-24 00:23:40 -0400
committerTim Rozet <trozet@redhat.com>2017-05-24 00:23:40 -0400
commitefe68a7d2781f79b240a6f1bd3a1dd3798775df0 (patch)
treee83973f41bcfb00573cc7376a6a16aa39acfa46a
parent69160baaeffd63bc5d1fd3eabf41e3879a8f817f (diff)
Functest: removes redundant exit 0 from fetch creds
Also allows unset and pipefail explicitly in set-functest-env.sh Change-Id: I06ae718f563fed0596a37cec1b3a78e44ee7ea5d Signed-off-by: Tim Rozet <trozet@redhat.com>
-rwxr-xr-xjjb/functest/set-functest-env.sh3
-rwxr-xr-xutils/fetch_os_creds.sh2
2 files changed, 3 insertions, 2 deletions
diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh
index be596cc2d..558e2487d 100755
--- a/jjb/functest/set-functest-env.sh
+++ b/jjb/functest/set-functest-env.sh
@@ -1,6 +1,9 @@
#!/bin/bash
set -e
+set +u
+set +o pipefail
+
[[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
# Prepare OpenStack credentials volume
diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh
index 6a382a56c..a5d5f8f3b 100755
--- a/utils/fetch_os_creds.sh
+++ b/utils/fetch_os_creds.sh
@@ -223,5 +223,3 @@ fi
echo "-------- Credentials: --------"
cat $dest_path
-
-exit 0