From: Delia Popescu <delia.popescu@enea.com>
Date: Thu, 3 Aug 2017 14:28:28 +0000 (+0300)
Subject: Integrate functest with ARM Architecture
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=57491ed06b1bf66a5b67b361ddc523b7114b770e;p=releng.git

Integrate functest with ARM Architecture


Reads architecture of first compute node found on MCP installer
and sends it as env variable when creating the conatiner.
It is needed by https://gerrit.opnfv.org/gerrit/#/c/39991/
JIRA: ARMBAND-279

Change-Id: I7eec485507bd182190e95c0478182f506db4c821
Signed-off-by: Delia Popescu <delia.popescu@enea.com>
---

diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh
index f6071e37a..10f949a3e 100755
--- a/jjb/functest/set-functest-env.sh
+++ b/jjb/functest/set-functest-env.sh
@@ -48,6 +48,12 @@ envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
     -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \
     -e BUILD_TAG=${BUILD_TAG} -e CI_DEBUG=${CI_DEBUG} -e DEPLOY_TYPE=${DEPLOY_TYPE}"
 
+if [[ ${INSTALLER_TYPE} == 'fuel' && ! -z ${SALT_MASTER_IP} ]]; then
+  HOST_ARCH=$(ssh -l ubuntu ${SALT_MASTER_IP} -i ${SSH_KEY} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no \
+  "sudo salt 'cmp*' grains.get cpuarch --out yaml |awk '{print \$2; exit}'")
+  envs="${envs} -e POD_ARCH=${HOST_ARCH}"
+fi
+
 if [[ ${INSTALLER_TYPE} == 'compass' && ${DEPLOY_SCENARIO} == *'os-nosdn-openo-ha'* ]]; then
     ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
     openo_msb_port=${openo_msb_port:-80}