aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYujun Zhang <zhang.yujunz@zte.com.cn>2017-10-03 21:45:28 +0800
committerYujun Zhang <zhang.yujunz@zte.com.cn>2017-10-03 21:45:28 +0800
commit3d5a7186f544797cc788c9a052b370aa072ad07d (patch)
tree586329073d55d35267bd1ee15d37c9c9eb37b185
parented650b7742db1530ca43761d10ee73e9055471bc (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>
-rw-r--r--resources/ansible_roles/qtip-generator/files/compute/host_vars/localhost.yml2
-rw-r--r--tests/ci/utils/start_services.sh1
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 815e2ea..cc587c6 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 3c481be..5c95ed7 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}