aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-11-02 21:45:58 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2019-11-02 22:58:18 +0100
commitef775f6614e7f37757a72a62dbee8733eaceb745 (patch)
treecf15b95c784a731f49ede6e3d43866e9c100752e
parent4e5ec2a6716789713917c99cb2efadbb72d2fc39 (diff)
Update xtesting to 0.80.0
It allows publishing the artifacts via Xtesting. It's required by the new Xtesting Ansible role [1]. [1] https://github.com/collivier/ansible-role-xtesting/commit/8c62525bb0d0b5f8dcc2c4436711d5d075de8811 Change-Id: I832e5e19467c7fd86a46574448faad4d6f2d4c0d Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit d0ee068c6e1c4a6e0a52156143a04feb6f9a78cb)
-rw-r--r--functest/ci/logging.debug.ini7
-rw-r--r--functest/ci/logging.ini7
-rw-r--r--functest/utils/env.py3
-rw-r--r--upper-constraints.txt2
4 files changed, 3 insertions, 16 deletions
diff --git a/functest/ci/logging.debug.ini b/functest/ci/logging.debug.ini
index 51ee359c6..764a4e206 100644
--- a/functest/ci/logging.debug.ini
+++ b/functest/ci/logging.debug.ini
@@ -1,5 +1,5 @@
[loggers]
-keys=root,functest,api,ci,core,cli,opnfv_tests,utils,xtesting,xci,xcore,energy,xutils,sfc,baro,warnings
+keys=root,functest,api,ci,core,cli,opnfv_tests,utils,xtesting,xci,xcore,xutils,sfc,baro,warnings
[handlers]
keys=console,wconsole,file,dfile
@@ -61,11 +61,6 @@ level=NOTSET
handlers=console
qualname=xtesting.core
-[logger_energy]
-level=NOTSET
-handlers=wconsole
-qualname=xtesting.energy
-
[logger_xutils]
level=NOTSET
handlers=wconsole
diff --git a/functest/ci/logging.ini b/functest/ci/logging.ini
index 278529e22..e2a440910 100644
--- a/functest/ci/logging.ini
+++ b/functest/ci/logging.ini
@@ -1,5 +1,5 @@
[loggers]
-keys=root,functest,api,ci,core,cli,opnfv_tests,utils,xtesting,xci,xcore,energy,xutils,sfc,baro,warnings
+keys=root,functest,api,ci,core,cli,opnfv_tests,utils,xtesting,xci,xcore,xutils,sfc,baro,warnings
[handlers]
keys=console,wconsole,file,null
@@ -61,11 +61,6 @@ level=NOTSET
handlers=console
qualname=xtesting.core
-[logger_energy]
-level=NOTSET
-handlers=wconsole
-qualname=xtesting.energy
-
[logger_xutils]
level=NOTSET
handlers=wconsole
diff --git a/functest/utils/env.py b/functest/utils/env.py
index 2c038b792..5aebbbe0c 100644
--- a/functest/utils/env.py
+++ b/functest/utils/env.py
@@ -29,9 +29,6 @@ INPUTS = {
'NODE_NAME': env.INPUTS['NODE_NAME'],
'POD_ARCH': 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'],
'VOLUME_DEVICE_NAME': 'vdb',
'IMAGE_PROPERTIES': '',
'FLAVOR_EXTRA_SPECS': '',
diff --git a/upper-constraints.txt b/upper-constraints.txt
index f33bba720..022c09b0d 100644
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -15,7 +15,7 @@ robotframework-httplibrary===0.4.2
robotframework-requests===0.4.7
robotframework-sshlibrary===2.1.3;python_version=='2.7'
ansible===2.3.2.0
-xtesting===0.62.0
+xtesting===0.80.0
git+https://git.openstack.org/openstack/networking-bgpvpn@10.0.0#egg=networking_bgpvpn
git+https://git.openstack.org/openstack/networking-sfc@8.0.0#egg=networking_sfc
neutron===14.0.1