Merge "Pass kwargs in TempestCommon:configure()"

diff --git a/docker/components/Dockerfile b/docker/components/Dockerfile
index a4561f6..356c5d5 100644 (file)
--- a/docker/components/Dockerfile
+++ b/docker/components/Dockerfile
@@ -1,9 +1,9 @@
 FROM opnfv/functest-core
 
 ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/pike
-ARG RALLY_TAG=stable/0.10
-ARG OS_FAULTS_TAG=0.1.16
+ARG OPENSTACK_TAG=stable/queens
+ARG RALLY_TAG=0.11.2
+ARG OS_FAULTS_TAG=0.1.17
 
 RUN apk --no-cache add --virtual .build-deps --update \
         python-dev build-base linux-headers libffi-dev \
@@ -20,7 +20,7 @@ RUN apk --no-cache add --virtual .build-deps --update \
     update-requirements -s --source /src/openstack-requirements /src/rally/ && \
     pip install --no-cache-dir --src /src -cupper-constraints.txt \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-        tempest /src/os-faults && \
+        tempest rally-openstack /src/os-faults && \
     pip install --no-cache-dir --src /src -cupper-constraints.txt \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
         /src/rally && \

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index a66993e..cb44105 100644 (file)
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:3.7
 
 ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/pike
+ARG OPENSTACK_TAG=stable/queens
 
 RUN apk --no-cache add --update \
         python libffi libssl1.0 libjpeg-turbo py-pip bash \

diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index 1a409b0..6846938 100644 (file)
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -1,10 +1,10 @@
 FROM opnfv/functest-core
 
 ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/pike
+ARG OPENSTACK_TAG=stable/queens
 ARG FDS_TAG=master
-ARG RALLY_TAG=stable/0.10
-ARG OS_FAULTS_TAG=0.1.16
+ARG RALLY_TAG=0.11.2
+ARG OS_FAULTS_TAG=0.1.17
 
 COPY thirdparty-requirements.txt thirdparty-requirements.txt
 RUN apk --no-cache add --update python3 sshpass && \
@@ -26,7 +26,7 @@ RUN apk --no-cache add --update python3 sshpass && \
     update-requirements -s --source /src/openstack-requirements /src/rally/ && \
     pip install --no-cache-dir --src /src -cupper-constraints.txt \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-        tempest /src/os-faults && \
+        tempest rally-openstack /src/os-faults && \
     pip install --no-cache-dir --src /src -cupper-constraints.txt \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
         /src/rally -rthirdparty-requirements.txt && \

diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml
index a0cf3f9..5da40c1 100644 (file)
--- a/docker/features/testcases.yaml
+++ b/docker/features/testcases.yaml
@@ -16,7 +16,7 @@ tiers:
                 description: >-
                     Test suite from Doctor project.
                 dependencies:
-                    installer: 'apex'
+                    installer: '(apex)|(fuel)|(daisy)'
                     scenario: '^((?!fdio|nofeature).)*$'
                 run:
                     module: 'xtesting.core.feature'
@@ -27,6 +27,7 @@ tiers:
             -
                 case_name: bgpvpn
                 project_name: sdnvpn
+                enabled: false
                 criteria: 100
                 blocking: false
                 description: >-

diff --git a/docker/features/thirdparty-requirements.txt b/docker/features/thirdparty-requirements.txt
index 73c11b4..910b514 100644 (file)
--- a/docker/features/thirdparty-requirements.txt
+++ b/docker/features/thirdparty-requirements.txt
@@ -2,6 +2,6 @@ robotframework-httplibrary
 robotframework-requests
 robotframework-sshlibrary;python_version=='2.7'
 baro_tests
-sdnvpn
+# sdnvpn
 sfc
 doctor-tests;python_version>='3.0'

diff --git a/docker/parser/Dockerfile b/docker/parser/Dockerfile
index bbc0a07..fe21bb5 100644 (file)
--- a/docker/parser/Dockerfile
+++ b/docker/parser/Dockerfile
@@ -1,9 +1,7 @@
 FROM opnfv/functest-core
 
 ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/pike
-ARG RALLY_TAG=stable/0.10
-ARG OS_FAULTS_TAG=0.1.16
+ARG OPENSTACK_TAG=stable/queens
 
 COPY thirdparty-requirements.txt thirdparty-requirements.txt
 RUN apk --no-cache add --virtual .build-deps --update \

diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index e09ea1c..9b99282 100644 (file)
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -1,12 +1,12 @@
 FROM opnfv/functest-core
 
 ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/pike
+ARG OPENSTACK_TAG=stable/queens
 ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4
-ARG RALLY_TAG=stable/0.10
-ARG OS_FAULTS_TAG=0.1.16
+ARG RALLY_TAG=0.11.2
+ARG OS_FAULTS_TAG=0.1.17
 ARG REFSTACK_TARGET=2017.09
-ARG PATROLE_TAG=0.2.0
+ARG PATROLE_TAG=0.3.0
 
 COPY thirdparty-requirements.txt thirdparty-requirements.txt
 RUN apk --no-cache add --virtual .build-deps --update \
@@ -27,7 +27,7 @@ RUN apk --no-cache add --virtual .build-deps --update \
     update-requirements -s --source /src/openstack-requirements /src/patrole/ && \
     pip install --no-cache-dir --src /src -cupper-constraints.txt \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-        tempest /src/os-faults && \
+        tempest rally-openstack /src/os-faults && \
     pip install --no-cache-dir --src /src -cupper-constraints.txt \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
         /src/rally /src/patrole -rthirdparty-requirements.txt && \

diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index e65c0c4..afaec23 100644 (file)
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -1,7 +1,7 @@
 FROM opnfv/functest-core
 
 ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/pike
+ARG OPENSTACK_TAG=stable/queens
 ARG VIMS_TAG=stable
 ARG JUJU_TAG=tags/juju-2.2.5
 

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index d3474c1..dbdf030 100644 (file)
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -267,7 +267,7 @@ tiers:
                 description: >-
                     Test suite from Doctor project.
                 dependencies:
-                    installer: 'apex'
+                    installer: '(apex)|(fuel)|(daisy)'
                     scenario: '^((?!fdio|nofeature).)*$'
                 run:
                     module: 'xtesting.core.feature'
@@ -278,6 +278,7 @@ tiers:
             -
                 case_name: bgpvpn
                 project_name: sdnvpn
+                enabled: false
                 criteria: 100
                 blocking: false
                 description: >-

diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 22cb64c..bba8c4f 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -114,7 +114,7 @@ class TempestCommon(testcase.TestCase):
                 testr_mode = r"'^tempest\.'"
             else:
                 testr_mode = self.mode
-            cmd = "(cd {0}; testr list-tests {1} >{2} 2>/dev/null)".format(
+            cmd = "(cd {0}; stestr list {1} >{2} 2>/dev/null)".format(
                 self.verifier_repo_dir, testr_mode, self.list)
             output = subprocess.check_output(cmd, shell=True)
             LOGGER.info("%s\n%s", cmd, output)
@@ -181,12 +181,10 @@ class TempestCommon(testcase.TestCase):
             for line in iter(proc.stdout.readline, b''):
                 if re.search(r"\} tempest\.", line):
                     LOGGER.info(line.replace('\n', ''))
-                elif re.search('Starting verification', line):
-                    LOGGER.info(line.replace('\n', ''))
-                    first_pos = line.index("UUID=") + len("UUID=")
-                    last_pos = line.index(") for deployment")
-                    self.verification_id = line[first_pos:last_pos]
-                    LOGGER.debug('Verification UUID: %s', self.verification_id)
+                elif re.search(r'(?=\(UUID=(.*)\))', line):
+                    self.verification_id = re.search(
+                        r'(?=\(UUID=(.*)\))', line).group(1)
+                    LOGGER.info('Verification UUID: %s', self.verification_id)
                 f_stdout.write(line)
         proc.wait()
 

diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.py b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
index da55ecf..c2fda68 100644 (file)
--- a/functest/opnfv_tests/vnf/ims/cloudify_ims.py
+++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
@@ -412,8 +412,7 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase):
             cfy_client.deployments.delete(self.vnf['descriptor'].get('name'))
             cfy_client.blueprints.delete(self.vnf['descriptor'].get('name'))
         except Exception:  # pylint: disable=broad-except
-            self.__logger.warn("Some issue during the undeployment ..")
-            self.__logger.warn("Tenant clean continue ..")
+            self.__logger.exception("Some issue during the undeployment ..")
 
         super(CloudifyIms, self).clean()
 

diff --git a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
index 0f46312..9f6327b 100644 (file)
--- a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
+++ b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
@@ -434,8 +434,8 @@ class CloudifyVrouter(vrouter_base.VrouterOnBoardingBase):
             cfy_client.deployments.delete(self.vnf['descriptor'].get('name'))
             cfy_client.blueprints.delete(self.vnf['descriptor'].get('name'))
         except Exception:  # pylint: disable=broad-except
-            self.__logger.warn("Some issue during the undeployment ..")
-            self.__logger.warn("Tenant clean continue ..")
+            self.__logger.exception("Some issue during the undeployment ..")
+
         super(CloudifyVrouter, self).clean()
 
     def get_vnf_info_list(self, target_vnf_name):

diff --git a/functest/tests/unit/openstack/tempest/test_tempest.py b/functest/tests/unit/openstack/tempest/test_tempest.py
index e2c4c97..5328b06 100644 (file)
--- a/functest/tests/unit/openstack/tempest/test_tempest.py
+++ b/functest/tests/unit/openstack/tempest/test_tempest.py
@@ -82,7 +82,7 @@ class OSTempestTesting(unittest.TestCase):
         else:
             testr_mode = self.tempestcommon.mode
         verifier_repo_dir = 'test_verifier_repo_dir'
-        cmd = "(cd {0}; testr list-tests {1} >{2} 2>/dev/null)".format(
+        cmd = "(cd {0}; stestr list {1} >{2} 2>/dev/null)".format(
             verifier_repo_dir, testr_mode, self.tempestcommon.list)
         self.tempestcommon.generate_test_list()
         mock_exec.assert_called_once_with(cmd, shell=True)

diff --git a/requirements.txt b/requirements.txt
index 3196f52..fa0a17b 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
-PyYAML>=3.10.0 # MIT
+PyYAML>=3.12 # MIT
 GitPython>=1.0.1 # BSD License (3 clause)
 requests>=2.14.2 # Apache-2.0
 robotframework>=3.0
@@ -16,15 +16,15 @@ Flask!=0.11,<1.0,>=0.10 # BSD
 Flask-RESTful>=0.3.5 # BSD
 IPy
 flasgger # MIT
-mock>=2.0 # BSD
+mock>=2.0.0 # BSD
 PrettyTable<0.8,>=0.7.1 # BSD
-six>=1.9.0 # MIT
+six>=1.10.0 # MIT
 snaps
 SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
-paramiko>=2.0 # LGPLv2.1+
-Jinja2!=2.9.0,!=2.9.1,!=2.9.2,!=2.9.3,!=2.9.4,>=2.8 # BSD License (3 clause)
-httplib2>=0.7.5 # MIT
-oslo.serialization!=2.19.1,>=1.10.0 # Apache-2.0
-oslo.utils>=3.20.0 # Apache-2.0
+paramiko>=2.0.0 # LGPLv2.1+
+Jinja2>=2.10 # BSD License (3 clause)
+httplib2>=0.9.1 # MIT
+oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
+oslo.utils>=3.33.0 # Apache-2.0
 xtesting
 refstack-client

diff --git a/test-requirements.txt b/test-requirements.txt
index 82d1222..84c5a44 100644 (file)
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,12 +2,12 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 coverage!=4.4,>=4.0 # Apache-2.0
-mock>=2.0 # BSD
-nose # LGPL
+mock>=2.0.0 # BSD
+nose>=1.3.7 # LGPL
 flake8<2.6.0,>=2.5.4 # MIT
 pylint==1.4.5 # GPLv2
-sphinx>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
 sphinx-opnfv-theme
 sphinx-rtd-theme
 yamllint
-doc8 # Apache-2.0
+doc8>=0.6.0 # Apache-2.0

diff --git a/tox.ini b/tox.ini
index aa3087a..9fb5a41 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ envlist = docs,pep8,pylint,yamllint,py35,py27,perm,cover
 usedevelop = True
 deps =
   -c{toxinidir}/upper-constraints.txt
-  -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike
+  -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
 install_command = pip install {opts} {packages}

diff --git a/upper-constraints.txt b/upper-constraints.txt
index 7e02ba8..e2b7ee7 100644 (file)
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -19,6 +19,7 @@ robotframework-sshlibrary===2.1.3;python_version=='2.7'
 IPy===0.83
 ansible===2.3.2.0
 flasgger===0.6.6
-xtesting===0.31.0
-networking-bgpvpn===7.0.0
+xtesting===0.40.0
+networking-bgpvpn===8.0.0
 sphinx-opnfv-theme===0.1.1
+rally-openstack===1.0.0