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)

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 815e2ea..cc587c6 100644 (file)
--- 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 3c481be..5c95ed7 100644 (file)
--- 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}