aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-05 04:21:01 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-05 20:16:17 +0000
commit5e2c2b7842214dffa69c3fd11c87d26f3109dc85 (patch)
tree3af0c52a3eec068954d012f912b5494e616fd763
parentb22219a381a5124febbb0b96ddf1d0828e9cf3ed (diff)
deploy.sh: Silence cleanup output
Cleanup sequence might print some warnings/errors that are misleading for new users, so let's silence them. While at it, remove unused `cleanup` function stub. Change-Id: Ic4225f7d4b701cd15d96e1bfc5eecfe2c4291eb6 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 84f131b32ac510097c3aac321fb1ca67bafc8941)
-rwxr-xr-xci/deploy.sh15
1 files changed, 1 insertions, 14 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 90f789a2d..09167dc83 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -14,8 +14,7 @@
#
do_exit () {
local RC=$?
- clean
- cleanup_mounts
+ cleanup_mounts > /dev/null 2>&1
if [ ${RC} -eq 0 ]; then
notify "\n[OK] MCP: Openstack installation finished succesfully!\n\n" 2
else
@@ -134,16 +133,6 @@ notify() {
##############################################################################
##############################################################################
-# BEGIN of deployment clean-up
-#
-clean() {
- echo "Cleaning up deploy tmp directories"
-}
-#
-# END of deployment clean-up
-##############################################################################
-
-##############################################################################
# BEGIN of variables to customize
#
CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
@@ -272,8 +261,6 @@ trap do_exit SIGINT SIGTERM EXIT
# Set no restrictive umask so that Jenkins can remove any residuals
umask 0000
-clean
-
pushd "${DEPLOY_DIR}" > /dev/null
# Prepare the deploy config files based on lab/pod information, deployment
# scenario, etc.