summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorxudan <xudan16@huawei.com>2018-03-14 04:17:12 -0400
committerxudan <xudan16@huawei.com>2018-03-14 04:17:12 -0400
commit9dfd371891f1aff6198b8c88b15ebe241c921e24 (patch)
treecc6958f9ce3155659e9fc319291a8e3559df44bc /jjb
parent7862b47133a7ec4f85cb8b3a1b8ea7452fe41bc1 (diff)
Change the path of images from pre_config/ to images/
1. change the path of all images 2. remove the sdnvpn special envs This patch should be merged after these 2 patches. 1. https://gerrit.opnfv.org/gerrit/#/c/53395/ 2. https://gerrit.opnfv.org/gerrit/#/c/53757/ Change-Id: Ie1dc9388be52629c5fcc0ef893963c4de2c72491 Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/dovetail/dovetail-run.sh17
1 files changed, 9 insertions, 8 deletions
diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index ec879e325..a5a95f402 100755
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -24,6 +24,9 @@ mkdir -p ${DOVETAIL_HOME}
DOVETAIL_CONFIG=${DOVETAIL_HOME}/pre_config
mkdir -p ${DOVETAIL_CONFIG}
+DOVETAIL_IMAGES=${DOVETAIL_HOME}/images
+mkdir -p ${DOVETAIL_IMAGES}
+
ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
sshkey=""
@@ -189,7 +192,7 @@ if [[ ! -f ${ubuntu_image} ]]; then
echo "Download image ubuntu-16.04-server-cloudimg-amd64-disk1.img ..."
wget -q -nc http://artifacts.opnfv.org/sdnvpn/ubuntu-16.04-server-cloudimg-amd64-disk1.img -P ${image_path}
fi
-sudo cp ${ubuntu_image} ${DOVETAIL_CONFIG}
+sudo cp ${ubuntu_image} ${DOVETAIL_IMAGES}
# functest needs to download this image first before running
cirros_image=${image_path}/cirros-0.3.5-x86_64-disk.img
@@ -197,7 +200,7 @@ if [[ ! -f ${cirros_image} ]]; then
echo "Download image cirros-0.3.5-x86_64-disk.img ..."
wget -q -nc http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img -P ${image_path}
fi
-sudo cp ${cirros_image} ${DOVETAIL_CONFIG}
+sudo cp ${cirros_image} ${DOVETAIL_IMAGES}
# snaps_smoke test case needs to download this image first before running
ubuntu14_image=${image_path}/ubuntu-14.04-server-cloudimg-amd64-disk1.img
@@ -205,7 +208,7 @@ if [[ ! -f ${ubuntu14_image} ]]; then
echo "Download image ubuntu-14.04-server-cloudimg-amd64-disk1.img ..."
wget -q -nc https://cloud-images.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-cloudimg-amd64-disk1.img -P ${image_path}
fi
-sudo cp ${ubuntu14_image} ${DOVETAIL_CONFIG}
+sudo cp ${ubuntu14_image} ${DOVETAIL_IMAGES}
# cloudify_ims test case needs to download these 2 images first before running
cloudify_image=${image_path}/cloudify-manager-premium-4.0.1.qcow2
@@ -213,13 +216,13 @@ if [[ ! -f ${cloudify_image} ]]; then
echo "Download image cloudify-manager-premium-4.0.1.qcow2 ..."
wget -q -nc http://repository.cloudifysource.org/cloudify/4.0.1/sp-release/cloudify-manager-premium-4.0.1.qcow2 -P ${image_path}
fi
-sudo cp ${cloudify_image} ${DOVETAIL_CONFIG}
+sudo cp ${cloudify_image} ${DOVETAIL_IMAGES}
trusty_image=${image_path}/trusty-server-cloudimg-amd64-disk1.img
if [[ ! -f ${trusty_image} ]]; then
echo "Download image trusty-server-cloudimg-amd64-disk1.img ..."
wget -q -nc http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img -P ${image_path}
fi
-sudo cp ${trusty_image} ${DOVETAIL_CONFIG}
+sudo cp ${trusty_image} ${DOVETAIL_IMAGES}
opts="--privileged=true -id"
@@ -236,10 +239,8 @@ fi
echo "Dovetail: Pulling image ${DOCKER_REPO}:${DOCKER_TAG}"
docker pull ${DOCKER_REPO}:$DOCKER_TAG >$redirect
-env4bgpvpn="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP}"
-
cmd="docker run ${opts} -e DOVETAIL_HOME=${DOVETAIL_HOME} ${docker_volume} ${dovetail_home_volume} \
- ${sshkey} ${env4bgpvpn} ${DOCKER_REPO}:${DOCKER_TAG} /bin/bash"
+ ${sshkey} ${DOCKER_REPO}:${DOCKER_TAG} /bin/bash"
echo "Dovetail: running docker run command: ${cmd}"
${cmd} >${redirect}
sleep 5