Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Correct the description of the bridge used by daisy"
[releng.git]
/
jjb
/
armband
/
armband-deploy.sh
diff --git
a/jjb/armband/armband-deploy.sh
b/jjb/armband/armband-deploy.sh
index
9964ed5
..
08d3233
100755
(executable)
--- a/
jjb/armband/armband-deploy.sh
+++ b/
jjb/armband/armband-deploy.sh
@@
-70,10
+70,6
@@
if [[ $LAB_CONFIG_URL =~ ^(git|ssh):// ]]; then
fi
fi
fi
fi
-if [[ "$NODE_NAME" =~ "virtual" ]]; then
- POD_NAME="virtual_kvm"
-fi
-
# releng wants us to use nothing else but opnfv.iso for now. We comply.
ISO_FILE=$WORKSPACE/opnfv.iso
# releng wants us to use nothing else but opnfv.iso for now. We comply.
ISO_FILE=$WORKSPACE/opnfv.iso
@@
-95,7
+91,7
@@
fi
# construct the command
DEPLOY_COMMAND="$WORKSPACE/ci/deploy.sh -b ${LAB_CONFIG_URL} \
-l $LAB_NAME -p $POD_NAME -s $DEPLOY_SCENARIO -i file://${ISO_FILE} \
# construct the command
DEPLOY_COMMAND="$WORKSPACE/ci/deploy.sh -b ${LAB_CONFIG_URL} \
-l $LAB_NAME -p $POD_NAME -s $DEPLOY_SCENARIO -i file://${ISO_FILE} \
- -
H -B ${DEFAULT_BRIDGE:-pxebr
} -S $TMPDIR -L $WORKSPACE/$FUEL_LOG_FILENAME \
+ -
B ${DEFAULT_BRIDGE:-,,,
} -S $TMPDIR -L $WORKSPACE/$FUEL_LOG_FILENAME \
${DEPLOY_CACHE}"
# log info to console
${DEPLOY_CACHE}"
# log info to console