diff options
| -rw-r--r-- | docker/smoke/Dockerfile | 12 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/tempest.py | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 9b99282c7..d4415cedd 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -18,19 +18,23 @@ RUN apk --no-cache add --virtual .build-deps --update \ pip install --no-cache-dir --src /src -cupper-constraints.txt \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ -e git+https://github.com/openstack/requirements@$OPENSTACK_TAG#egg=openstack_requirements && \ - git clone --depth 1 https://github.com/openstack/os-faults.git -b $OS_FAULTS_TAG /src/os-faults && \ + git clone https://github.com/openstack/os-faults.git /src/os-faults && \ + (cd /src/os-faults && git checkout $OS_FAULTS_TAG) && \ update-requirements -s --source /src/openstack-requirements /src/os-faults/ && \ - git clone --depth 1 https://github.com/openstack/rally.git -b $RALLY_TAG /src/rally && \ + git clone https://github.com/openstack/rally.git /src/rally && \ + (cd /src/rally && git checkout $RALLY_TAG) && \ update-requirements -s --source /src/openstack-requirements /src/rally/ && \ git clone https://github.com/openstack/patrole.git /src/patrole && \ (cd /src/patrole && git checkout $PATROLE_TAG) && \ update-requirements -s --source /src/openstack-requirements /src/patrole/ && \ + git clone --depth 1 https://github.com/openstack/neutron-tempest-plugin.git /src/neutron-tempest-plugin && \ + update-requirements -s --source /src/openstack-requirements /src/neutron-tempest-plugin && \ pip install --no-cache-dir --src /src -cupper-constraints.txt \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ 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 && \ + /src/rally /src/patrole /src/neutron-tempest-plugin -rthirdparty-requirements.txt && \ git clone https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \ (cd /src/odl_test && git checkout $ODL_TAG) && \ virtualenv --system-site-packages /src/tempest/.venv && \ @@ -41,7 +45,7 @@ RUN apk --no-cache add --virtual .build-deps --update \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ -r /src/neutron/test-requirements.txt && \ rm -r upper-constraints.txt thirdparty-requirements.txt /src/odl_test/.git \ - /src/os-faults /src/rally && \ + /src/os-faults /src/rally /src/neutron-tempest-plugin && \ mkdir -p /etc/rally && \ printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \ mkdir -p /var/lib/rally/database && rally db create && \ diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index e9f023261..9c97b01fb 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -308,7 +308,7 @@ class TempestNeutronTrunk(TempestCommon): if "case_name" not in kwargs: kwargs["case_name"] = 'neutron_trunk' TempestCommon.__init__(self, **kwargs) - self.mode = "'neutron.tests.tempest.(api|scenario).test_trunk'" + self.mode = "'neutron_tempest_plugin.(api|scenario).test_trunk'" self.res_dir = os.path.join( getattr(config.CONF, 'dir_results'), 'neutron_trunk') self.raw_list = os.path.join(self.res_dir, 'test_raw_list.txt') |