diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2017-08-24 14:28:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-24 14:28:20 +0000 |
| commit | 75ad867556d9475c7881863dfb44ccdcc154228b (patch) | |
| tree | ba8e8498fee16bf5b6977e5e974ac597130b4901 | |
| parent | 17ff08645fc8e6e8b2c0bc22152f2cab44d3f92b (diff) | |
| parent | 57491ed06b1bf66a5b67b361ddc523b7114b770e (diff) | |
Merge "Integrate functest with ARM Architecture"
| -rwxr-xr-x | jjb/functest/set-functest-env.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh index b84ca6be4..7d9e737e7 100755 --- a/jjb/functest/set-functest-env.sh +++ b/jjb/functest/set-functest-env.sh @@ -50,6 +50,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} |