From bd3f02f681a8fb2f6ea0fb194fe9cd398bffb61b Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Tue, 3 Oct 2017 21:45:28 +0800 Subject: Lookup in enviroment for OPNFV release name this is used in testapi reporting Change-Id: If0a2ef1d406544f5c8648fb653ff6c2334abf5e8 Signed-off-by: Yujun Zhang (cherry picked from commit 3d5a7186f544797cc788c9a052b370aa072ad07d) --- .../ansible_roles/qtip-generator/files/compute/host_vars/localhost.yml | 2 +- tests/ci/utils/start_services.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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} -- cgit 1.2.3-korg