Code Review
/
armband.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
p/fuel: states: maas: Retry linux state on VCP VMs
[armband.git]
/
ci
/
deploy.sh
diff --git
a/ci/deploy.sh
b/ci/deploy.sh
index
8ad1166
..
b81e5c8
100755
(executable)
--- a/
ci/deploy.sh
+++ b/
ci/deploy.sh
@@
-9,13
+9,16
@@
#
set -e
#
set -e
-cd $WORKSPACE
-make submodules-init
+SCRIPT_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
+
+export ARMBAND_BASE=$(readlink -e ${SCRIPT_DIR}/..)
+
+cd ${WORKSPACE:-${ARMBAND_BASE}}
make patches-import
# source local environment variables
if ! [ -z $LAB_CONFIG_URL ]; then
make patches-import
# source local environment variables
if ! [ -z $LAB_CONFIG_URL ]; then
- while getopts "
l:p:
" OPTION 2>/dev/null
+ while getopts "
b:B:dfFl:L:p:s:S:T:i:he
" OPTION 2>/dev/null
do
case $OPTION in
l) TARGET_LAB=$OPTARG;;
do
case $OPTION in
l) TARGET_LAB=$OPTARG;;
@@
-34,5
+37,6
@@
if ! [ -z $LAB_CONFIG_URL ]; then
fi
fi
fi
fi
+unset SSH_KEY
cd upstream/fuel/ci
./deploy.sh $@
cd upstream/fuel/ci
./deploy.sh $@