diff options
| author |   Jun Li <matthew.lijun@huawei.com> | 2017-05-03 09:39:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-05-03 09:39:06 +0000 |
| commit | fc5f95a30145e201ea6bc484d14598a6783ec4da (patch) | |
| tree | f684e62dfbe8a73d7b24ca3c7ee1c118c6dfdfde | |
| parent | 3d3a5d73637d09180d986c9307b18ffd68da160e (diff) | |
| parent | 8c7e5532449e085f81c7363009e7eb57cef9fc09 (diff) | |
Merge "Support opera test in functest releng"
| -rw-r--r-- | jjb/functest/functest-daily-jobs.yml | 1 | ||||
| -rwxr-xr-x | jjb/functest/set-functest-env.sh | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml index 9e2cdd41c..3c04a4ac0 100644 --- a/jjb/functest/functest-daily-jobs.yml +++ b/jjb/functest/functest-daily-jobs.yml @@ -302,6 +302,7 @@ - 'vims' - 'multisite' - 'parser' + - 'opera_vims' - string: name: TESTCASE_OPTIONS default: '' diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh index 05e3d5792..569f371c4 100755 --- a/jjb/functest/set-functest-env.sh +++ b/jjb/functest/set-functest-env.sh @@ -70,6 +70,15 @@ 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} == 'compass' && ${DEPLOY_SCENARIO} == *'os-nosdn-openo-ha'* ]]; then + ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" + openo_msb_port=${openo_msb_port:-80} + openo_msb_endpoint="$(sshpass -p'root' ssh 2>/dev/null $ssh_options root@${installer_ip} \ + 'mysql -ucompass -pcompass -Dcompass -e "select package_config from cluster;" \ + | sed s/,/\\n/g | grep openo_ip | cut -d \" -f 4'):$openo_msb_port" + + envs=${env}" -e OPENO_MSB_ENDPOINT=${openo_msb_endpoint}" +fi volumes="${results_vol} ${sshkey_vol} ${stackrc_vol} ${rc_file_vol}" |