diff options
| author |   Yang Yu <Gabriel.yuyang@huawei.com> | 2017-08-02 16:28:28 +0800 |
|---|---|---|
| committer | Yang Yu <Gabriel.yuyang@huawei.com> | 2017-08-02 18:52:43 +0800 |
| commit | 36603a7d0d5e621dccea6e9844995a149bb0b902 (patch) | |
| tree | 741954548da8029fb7f2f00a9f41f391b934383a /jjb/bottlenecks | |
| parent | 054cc9c27668ccd18d970ee0c88138178301478b (diff) | |
Add envs to Bottlenecks docker
JIRA: BOTTLENECK-158
Pass envs to Bottlenecks docker that used for report
Change-Id: Id7e34533c5fdd81dacaf95bb9321625dd6c8713c
Signed-off-by: Yang Yu <Gabriel.yuyang@huawei.com>
Diffstat (limited to 'jjb/bottlenecks')
| -rw-r--r-- | jjb/bottlenecks/bottlenecks-ci-jobs.yml | 6 | ||||
| -rw-r--r-- | jjb/bottlenecks/bottlenecks-run-suite.sh | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml index 455fa7247..bb9e0f291 100644 --- a/jjb/bottlenecks/bottlenecks-ci-jobs.yml +++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml @@ -154,7 +154,7 @@ parameters: - string: name: BOTTLENECKS_DB_TARGET - default: '104.197.68.199:8086' + default: 'testresults.opnfv.org/test/api/v1/results' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -162,7 +162,7 @@ parameters: - string: name: BOTTLENECKS_DB_TARGET - default: '' + default: 'testresults.opnfv.org/test/api/v1/results' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -170,5 +170,5 @@ parameters: - string: name: BOTTLENECKS_DB_TARGET - default: '104.197.68.199:8086' + default: 'testresults.opnfv.org/test/api/v1/results' description: 'Arguments to use in order to choose the backend DB' diff --git a/jjb/bottlenecks/bottlenecks-run-suite.sh b/jjb/bottlenecks/bottlenecks-run-suite.sh index b81f4cace..06fb5dacd 100644 --- a/jjb/bottlenecks/bottlenecks-run-suite.sh +++ b/jjb/bottlenecks/bottlenecks-run-suite.sh @@ -53,9 +53,14 @@ if [[ $SUITE_NAME == *posca* ]]; then docker pull opnfv/bottlenecks:${DOCKER_TAG} >$redirect opts="--privileged=true -id" + envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \ + -e NODE_NAME=${NODE_NAME} -e EXTERNAL_NET=${EXTERNAL_NETWORK} \ + -e BRANCH=${BRANCH} -e GERRIT_REFSPEC_DEBUG=${GERRIT_REFSPEC_DEBUG} \ + -e BOTTLENECKS_DB_TARGET=${BOTTLENECKS_DB_TARGET} -e PACKAGE_URL=${PACKAGE_URL} \ + -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO}" docker_volume="-v /var/run/docker.sock:/var/run/docker.sock -v /tmp:/tmp" - cmd="docker run ${opts} --name bottlenecks-load-master ${docker_volume} opnfv/bottlenecks:${DOCKER_TAG} /bin/bash" + cmd="docker run ${opts} ${envs} --name bottlenecks-load-master ${docker_volume} opnfv/bottlenecks:${DOCKER_TAG} /bin/bash" echo "BOTTLENECKS INFO: running docker run commond: ${cmd}" ${cmd} >$redirect sleep 5 |