From 5cb9051a0418815636a1d5df66940e168c4e0a56 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 1 Mar 2018 15:20:10 +0100 Subject: Leverage on Xtesting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It removes all the files which have moved to Xtesting. Vnf inheritances and env management will be improved in other changes. It keeps the same tree thanks to a symlink to allow publishing artifacts. Change-Id: I551bbd3f344cdab0158a50b7b09e541576695631 Signed-off-by: Cédric Ollivier --- functest/utils/env.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'functest/utils/env.py') diff --git a/functest/utils/env.py b/functest/utils/env.py index aa2da0b54..dc50a2daf 100644 --- a/functest/utils/env.py +++ b/functest/utils/env.py @@ -12,20 +12,21 @@ import os import prettytable +from xtesting.utils import env INPUTS = { 'EXTERNAL_NETWORK': None, - 'CI_LOOP': 'daily', - 'DEPLOY_SCENARIO': 'os-nosdn-nofeature-noha', - 'INSTALLER_TYPE': None, + 'CI_LOOP': env.INPUTS['CI_LOOP'], + 'DEPLOY_SCENARIO': env.INPUTS['DEPLOY_SCENARIO'], + 'INSTALLER_TYPE': env.INPUTS['INSTALLER_TYPE'], 'SDN_CONTROLLER_IP': None, - 'BUILD_TAG': None, - 'NODE_NAME': None, + 'BUILD_TAG': env.INPUTS['BUILD_TAG'], + 'NODE_NAME': env.INPUTS['NODE_NAME'], 'POD_ARCH': None, - 'TEST_DB_URL': 'http://testresults.opnfv.org/test/api/v1/results', - 'ENERGY_RECORDER_API_URL': 'http://energy.opnfv.fr/resources', - 'ENERGY_RECORDER_API_USER': None, - 'ENERGY_RECORDER_API_PASSWORD': None + 'TEST_DB_URL': env.INPUTS['TEST_DB_URL'], + 'ENERGY_RECORDER_API_URL': env.INPUTS['ENERGY_RECORDER_API_URL'], + 'ENERGY_RECORDER_API_USER': env.INPUTS['ENERGY_RECORDER_API_USER'], + 'ENERGY_RECORDER_API_PASSWORD': env.INPUTS['ENERGY_RECORDER_API_PASSWORD'] } -- cgit 1.2.3-korg