summaryrefslogtreecommitdiffstats
path: root/jjb/functest/set-functest-env.sh
diff options
context:
space:
mode:
authorCristina Pauna <cristina.pauna@enea.com>2017-02-10 16:38:00 +0200
committerCristina Pauna <cristina.pauna@enea.com>2017-02-10 16:48:37 +0200
commit1e2f80cdd0938a78dbbc3253f11f6ea8662d7d87 (patch)
tree4165fd378aae4ed9e80b0b06858f2b04ea26cc7f /jjb/functest/set-functest-env.sh
parent3db5a7e6775e3ad247d9de03a0a6254f6eeb0bf6 (diff)
Use the aarch64 image for functest
An aarch64 image was created for functest in https://gerrit.opnfv.org/gerrit/#/c/27801/ This image is build and pushed with https://gerrit.opnfv.org/gerrit/#/c/28291/ In this commit, the aarch64 image is pulled when an aarch64 jenkins slave is used for running functest. JIRA: ARMBAND-180 Change-Id: Idfe7115275a056ef5137cff0a963910c2707457c Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
Diffstat (limited to 'jjb/functest/set-functest-env.sh')
-rwxr-xr-xjjb/functest/set-functest-env.sh17
1 files changed, 11 insertions, 6 deletions
diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh
index afd656f52..5224793dc 100755
--- a/jjb/functest/set-functest-env.sh
+++ b/jjb/functest/set-functest-env.sh
@@ -70,17 +70,22 @@ envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
volumes="${results_vol} ${sshkey_vol} ${stackrc_vol} ${rc_file_vol}"
+HOST_ARCH=$(uname -m)
+FUNCTEST_IMAGE="opnfv/functest"
+if [ "$HOST_ARCH" = "aarch64" ]; then
+ FUNCTEST_IMAGE="${FUNCTEST_IMAGE}_${HOST_ARCH}"
+fi
-echo "Functest: Pulling image opnfv/functest:${DOCKER_TAG}"
-docker pull opnfv/functest:$DOCKER_TAG >/dev/null
+echo "Functest: Pulling image ${FUNCTEST_IMAGE}:${DOCKER_TAG}"
+docker pull ${FUNCTEST_IMAGE}:$DOCKER_TAG >/dev/null
cmd="sudo docker run --privileged=true -id ${envs} ${volumes} \
${custom_params} ${TESTCASE_OPTIONS} \
- opnfv/functest:${DOCKER_TAG} /bin/bash"
+ ${FUNCTEST_IMAGE}:${DOCKER_TAG} /bin/bash"
echo "Functest: Running docker run command: ${cmd}"
${cmd} >${redirect}
sleep 5
-container_id=$(docker ps | grep "opnfv/functest:${DOCKER_TAG}" | awk '{print $1}' | head -1)
+container_id=$(docker ps | grep "${FUNCTEST_IMAGE}:${DOCKER_TAG}" | awk '{print $1}' | head -1)
echo "Container ID=${container_id}"
if [ -z ${container_id} ]; then
echo "Cannot find opnfv/functest container ID ${container_id}. Please check if it is existing."
@@ -91,8 +96,8 @@ echo "Starting the container: docker start ${container_id}"
docker start ${container_id}
sleep 5
docker ps >${redirect}
-if [ $(docker ps | grep "opnfv/functest:${DOCKER_TAG}" | wc -l) == 0 ]; then
- echo "The container opnfv/functest with ID=${container_id} has not been properly started. Exiting..."
+if [ $(docker ps | grep "${FUNCTEST_IMAGE}:${DOCKER_TAG}" | wc -l) == 0 ]; then
+ echo "The container ${FUNCTEST_IMAGE} with ID=${container_id} has not been properly started. Exiting..."
exit 1
fi
if [[ "$BRANCH" =~ 'brahmaputra' ]]; then