aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorselias <samelias@cisco.com>2017-02-20 10:49:01 +0100
committerselias <samelias@cisco.com>2017-02-20 10:54:19 +0100
commit5e59e02d72a8c98b1fa54a8c863349c605ef095a (patch)
tree2745ccf8174ce4d3c6ecda892528d7be1f9a8be9
parenta70972124d9774c60e6b1d2d8c43662f71ff35ae (diff)
HC Test: hc2vpp bootstrap script fix
Trying to scp both *.deb and *.rpm packages in one command will not work if only one of them exists. Change-Id: I9692efff309eb7eac64dd45873ee455fbbb48a86 Signed-off-by: selias <samelias@cisco.com>
-rwxr-xr-xbootstrap-hc2vpp-integration.sh9
-rwxr-xr-xbootstrap-hc2vpp-verify.sh9
2 files changed, 14 insertions, 4 deletions
diff --git a/bootstrap-hc2vpp-integration.sh b/bootstrap-hc2vpp-integration.sh
index e8c0d5e918..eec9eef400 100755
--- a/bootstrap-hc2vpp-integration.sh
+++ b/bootstrap-hc2vpp-integration.sh
@@ -150,8 +150,13 @@ for index in "${!VIRL_SERVER[@]}"; do
if [ "${copy}" -eq "0" ]; then
echo "files have already been copied to the VIRL host ${VIRL_SERVER[${index}]}"
else
- scp ${SSH_OPTIONS} *.deb *.rpm \
- ${VIRL_USERNAME}@${VIRL_SERVER[${index}]}:${VIRL_DIR_LOC}/
+ if [ "${OS}" == "centos7" ]; then
+ scp ${SSH_OPTIONS} *.rpm \
+ ${VIRL_USERNAME}@${VIRL_SERVER[${index}]}:${VIRL_DIR_LOC}/
+ else
+ scp ${SSH_OPTIONS} *.deb \
+ ${VIRL_USERNAME}@${VIRL_SERVER[${index}]}:${VIRL_DIR_LOC}/
+ fi
result=$?
if [ "${result}" -ne "0" ]; then
echo "Failed to copy files to VIRL host ${VIRL_SERVER[${index}]}"
diff --git a/bootstrap-hc2vpp-verify.sh b/bootstrap-hc2vpp-verify.sh
index af218427ee..40e6e4adda 100755
--- a/bootstrap-hc2vpp-verify.sh
+++ b/bootstrap-hc2vpp-verify.sh
@@ -146,8 +146,13 @@ for index in "${!VIRL_SERVER[@]}"; do
if [ "${copy}" -eq "0" ]; then
echo "files have already been copied to the VIRL host ${VIRL_SERVER[${index}]}"
else
- scp ${SSH_OPTIONS} *.deb *.rpm \
- ${VIRL_USERNAME}@${VIRL_SERVER[${index}]}:${VIRL_DIR_LOC}/
+ if [ "${OS}" == "centos7" ]; then
+ scp ${SSH_OPTIONS} *.rpm \
+ ${VIRL_USERNAME}@${VIRL_SERVER[${index}]}:${VIRL_DIR_LOC}/
+ else
+ scp ${SSH_OPTIONS} *.deb \
+ ${VIRL_USERNAME}@${VIRL_SERVER[${index}]}:${VIRL_DIR_LOC}/
+ fi
result=$?
if [ "${result}" -ne "0" ]; then
echo "Failed to copy files to VIRL host ${VIRL_SERVER[${index}]}"