diff options
| author |   Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-10-03 21:45:28 +0800 |
|---|---|---|
| committer | Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-10-03 14:06:09 +0000 |
| commit | bd3f02f681a8fb2f6ea0fb194fe9cd398bffb61b (patch) | |
| tree | 0af728bb6a601f56e570bdf908d2f8f505098df2 | |
| parent | 30e54370f3b2326234daa94bc14d9eeb9610cdbb (diff) | |
Lookup in enviroment for OPNFV release name
this is used in testapi reporting
Change-Id: If0a2ef1d406544f5c8648fb653ff6c2334abf5e8
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
(cherry picked from commit 3d5a7186f544797cc788c9a052b370aa072ad07d)
| -rw-r--r-- | resources/ansible_roles/qtip-generator/files/compute/host_vars/localhost.yml | 2 | ||||
| -rw-r--r-- | tests/ci/utils/start_services.sh | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/resources/ansible_roles/qtip-generator/files/compute/host_vars/localhost.yml b/resources/ansible_roles/qtip-generator/files/compute/host_vars/localhost.yml index 815e2ea3..cc587c69 100644 --- a/resources/ansible_roles/qtip-generator/files/compute/host_vars/localhost.yml +++ b/resources/ansible_roles/qtip-generator/files/compute/host_vars/localhost.yml @@ -13,4 +13,4 @@ project_name: qtip case_name: "{{ case_name|default('compute') }}" pod_name: "{{ pod_name|default('qtip-pod') }}" scenario: "{{ scenario|default('generic') }}" -version: "{{ version|default('master') }}" +version: "{{ lookup('env','OPNFV_RELEASE')|default('master') }}" diff --git a/tests/ci/utils/start_services.sh b/tests/ci/utils/start_services.sh index 3c481be4..5c95ed7e 100644 --- a/tests/ci/utils/start_services.sh +++ b/tests/ci/utils/start_services.sh @@ -15,6 +15,7 @@ TEST_SUITE=${TEST_SUITE} NODE_NAME=${NODE_NAME:-opnfv-pod} SCENARIO=${DEPLOY_SCENARIO:-generic} TESTAPI_URL=${TESTAPI_URL:-} +OPNFV_RELEASE=${OPNFV_RELEASE:-} EOF export SSH_CREDENTIALS=${SSH_CREDENTIALS:-/root/.ssh} |