aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scripts/common.sh3
-rwxr-xr-xscripts/osmo-ci-docker-rebuild.sh1
2 files changed, 3 insertions, 1 deletions
diff --git a/scripts/common.sh b/scripts/common.sh
index 1c2dfe0..af7c354 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -153,6 +153,7 @@ docker_images_require() {
# Subshell: run docker_images_require from jenkins-common.sh, pass all arguments
(. ../jenkins-common.sh; docker_images_require "$@")
-
+ ret=$?
cd "$oldpwd"
+ return $ret
}
diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh
index 943b5a0..6a1cc27 100755
--- a/scripts/osmo-ci-docker-rebuild.sh
+++ b/scripts/osmo-ci-docker-rebuild.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+set -e -x
cd "$(dirname "$0")/.."
. scripts/common.sh
docker_images_require \