diff options
| -rw-r--r-- | docker/thirdparty-requirements.txt | 1 | ||||
| -rw-r--r-- | functest/ci/config_functest.yaml | 4 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/tempest.py | 3 | ||||
| -rw-r--r-- | requirements.txt | 1 |
4 files changed, 3 insertions, 6 deletions
diff --git a/docker/thirdparty-requirements.txt b/docker/thirdparty-requirements.txt index 79e80f8e..40885787 100644 --- a/docker/thirdparty-requirements.txt +++ b/docker/thirdparty-requirements.txt @@ -2,7 +2,6 @@ git+https://gerrit.opnfv.org/gerrit/barometer#egg=baro_tests git+https://gerrit.opnfv.org/gerrit/sdnvpn#egg=sdnvpn git+https://gerrit.opnfv.org/gerrit/opera#egg=opera networking-bgpvpn -kingbird rally tempest>=12.1.0 # Apache-2.0 git+https://github.com/openstack/refstack-client#egg=refstack-client diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml index 60270b6c..d5b34ade 100644 --- a/functest/ci/config_functest.yaml +++ b/functest/ci/config_functest.yaml @@ -6,10 +6,8 @@ general: repo_tempest: /home/opnfv/repos/tempest dir_repo_releng: /home/opnfv/repos/releng repo_vims_test: /home/opnfv/repos/vnfs/vims-test - repo_sdnvpn: /home/opnfv/repos/sdnvpn repo_sfc: /home/opnfv/repos/sfc repo_onos: /home/opnfv/repos/onos - repo_promise: /home/opnfv/repos/promise repo_netready: /home/opnfv/repos/netready repo_barometer: /home/opnfv/repos/barometer repo_doctor: /home/opnfv/repos/doctor @@ -17,7 +15,6 @@ general: repo_parser: /home/opnfv/repos/parser repo_domino: /home/opnfv/repos/domino repo_snaps: /home/opnfv/repos/snaps - repo_opera: /home/opnfv/repos/opera repo_fds: /home/opnfv/repos/fds repo_securityscan: /home/opnfv/repos/securityscanning repo_vrouter: /home/opnfv/repos/vnfs/vrouter @@ -28,7 +25,6 @@ general: ims_data: /home/opnfv/functest/data/ims/ functest_images: /home/opnfv/functest/images rally_inst: /home/opnfv/.rally - repo_kingbird: /home/opnfv/repos/kingbird refstack_client: /home/opnfv/repos/refstack-client openstack: diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index cb8e9b4a..e565f5f9 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -12,6 +12,7 @@ from __future__ import division import logging import os +import pkg_resources import re import shutil import subprocess @@ -274,7 +275,7 @@ class TempestMultisite(TempestCommon): self.MODE = "feature_multisite" self.OPTION = "--concurrency 1" conf_utils.install_verifier_ext( - CONST.__getattribute__('dir_repo_kingbird')) + pkg_resources.resource_filename('kingbird', '..')) class TempestCustom(TempestCommon): diff --git a/requirements.txt b/requirements.txt index 6384f967..b8780793 100644 --- a/requirements.txt +++ b/requirements.txt @@ -25,5 +25,6 @@ mock>=2.0 # BSD iniparse==0.4 PrettyTable<0.8,>=0.7.1 # BSD six>=1.9.0 # MIT +kingbird opnfv snaps |