summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorHarry Huang <huangxiangyu5@huawei.com>2017-03-30 16:09:48 +0800
committerhuangxiangyu <huangxiangyu5@huawei.com>2017-05-03 17:04:49 +0800
commit8c7e5532449e085f81c7363009e7eb57cef9fc09 (patch)
tree60a93c5c705dd22461ef7e480ac2f0866c75bfe4 /jjb
parent0e1ec1044735fd3e946f3c8b7480a464b48f4d2e (diff)
Support opera test in functest releng
Because opera vnf test requires Open-O msb ip and the independency of this test case, set specific docker env vars for compass4nfv os-nosdn-openo-ha scenario. Change-Id: I486e3896dc86d29cf93818b317675c088c1c5198 Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/functest/functest-daily-jobs.yml1
-rwxr-xr-xjjb/functest/set-functest-env.sh9
2 files changed, 10 insertions, 0 deletions
diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index e8d14321f..0a2a2197c 100644
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -294,6 +294,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}"