aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-10 20:59:06 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-10-10 20:59:06 +0000
commit773df7376cf7eb15e78d1e029bdfc0220634484f (patch)
treeb3f1ef94419057fbe6fd3918519feb2a55b36584
parent9ce690257dd8cfa83ad68b8d8bfb2789caef3cb8 (diff)
parentad2f31e0dde446fc9c25b3ae761bb380171590a9 (diff)
Merge "ci/deploy.sh: Drop local_env support" into stable/euphrates
-rwxr-xr-xci/deploy.sh38
1 files changed, 8 insertions, 30 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index a2f489e..f35a6d1 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -1,41 +1,19 @@
#!/bin/bash
-#
-# (c) 2017 Enea Software AB
-#
+##############################################################################
+# Copyright (c) 2017 Enea Software AB and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Apache License, Version 2.0
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
-#
+##############################################################################
set -e
-SCRIPT_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
+SCRIPT_DIR=$(readlink -f "$(dirname "${BASH_SOURCE[0]}")")
+ARMBAND_BASE=$(readlink -e "${SCRIPT_DIR}/..")
+export ARMBAND_BASE
-export ARMBAND_BASE=$(readlink -e ${SCRIPT_DIR}/..)
-
-cd ${WORKSPACE:-${ARMBAND_BASE}}
+cd "${WORKSPACE:-${ARMBAND_BASE}}"
make patches-import
-# source local environment variables
-if ! [ -z $LAB_CONFIG_URL ]; then
- while getopts "b:B:dfFl:L:p:s:S:T:i:he" OPTION 2>/dev/null
- do
- case $OPTION in
- l) TARGET_LAB=$OPTARG;;
- p) TARGET_POD=$OPTARG;;
- esac
- done
- local_env=${LAB_CONFIG_URL}/labs/${TARGET_LAB}/${TARGET_POD}/fuel/config/local_env
- # try to fetch this file, but don't create it if it does not exist.
- # We add "|| true" to ignore the curl error when the file does not exist
- echo "curl -s -f -O $local_env || true"
- curl -s -f -O $local_env || true
- local_env=$(basename $local_env)
- if [ -e $local_env ]; then
- echo "-- Sourcing local environment file"
- source $local_env
- fi
-fi
-
cd upstream/fuel/ci
-./deploy.sh $@
+./deploy.sh "$@"