Update xtesting to 0.80.0

It allows publishing the artifacts via Xtesting.
It's required by the new Xtesting Ansible role [1].

It disables the pylint warning super-on-old-class which is falsy here
(xtesting 0.80 conforms with py3 rules).

[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)

diff --git a/functest/ci/logging.ini b/functest/ci/logging.ini
index 278529e..e2a4409 100644 (file)
--- 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 5d8e861..85676ed 100644 (file)
--- 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/tox.ini b/tox.ini
index 87e1b9a..9625bf4 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -41,7 +41,7 @@ basepython = python2.7
 commands =
   pylint \
     --ignore-imports=y --min-similarity-lines=10 \
-    --disable=locally-disabled functest
+    --disable=locally-disabled,super-on-old-class functest
 
 [testenv:yamllint]
 basepython = python2.7

diff --git a/upper-constraints.txt b/upper-constraints.txt
index 835f15f..a6e8377 100644 (file)
--- 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
 networking-bgpvpn===9.0.0
 networking-sfc===7.0.0
 neutron===13.0.2
@@ -25,3 +25,4 @@ ruamel.yaml.jinja2==0.2.2
 pylint===1.9.5;python_version=='2.7'
 pylint===2.3.1;python_version=='3.6'
 sphinxcontrib-spelling===4.2.1
+boto3===1.7.62