diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2019-06-01 11:00:14 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-06-01 11:14:18 +0200 |
| commit | f5078d6959b4725da6ba251909d5f3ffd5c149c1 (patch) | |
| tree | 67c1a233b298e27881f5bb87d32f0182d3767ed1 | |
| parent | 7a628f087403089d282cda14bcba858d8b0bc6c3 (diff) | |
Stop installing sfc and bgpvpn tempest plugins
They are being integrated into neutron tempest plugin [1][2].
It will fix our gates [3].
[1] https://github.com/openstack/neutron-tempest-plugin/commit/1a987ecb4d310328cc4c2c5628dc5018dc7afc48
[2] https://github.com/openstack/neutron-tempest-plugin/commit/8dd49aac9fa27166d76755c7d62ea9f0553d8d74
[3] https://build.opnfv.org/ci/job/functest-latest-gate/199/
Change-Id: Iafcfd0cb9b33a271cf37f269d9a3a2086eb67414
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | docker/smoke/Dockerfile | 3 | ||||
| -rw-r--r-- | docker/smoke/testcases.yaml | 4 | ||||
| -rw-r--r-- | functest/ci/testcases.yaml | 4 | ||||
| -rw-r--r-- | upper-constraints.txt | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 8a1d424a6..547295ad5 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -31,8 +31,7 @@ RUN apk --no-cache add --virtual .build-deps --update \ git checkout FETCH_HEAD) && \ update-requirements -s --source /src/openstack-requirements /src/barbican-tempest-plugin/ && \ pip3 install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ - /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin \ - networking-bgpvpn networking-sfc && \ + /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin && \ mkdir -p /home/opnfv/functest/data/refstack && \ mkdir -p /etc/neutron /etc/cinder /etc/glance /etc/keystone /etc/nova && \ wget -q -O /etc/glance/policy.json https://opendev.org/openstack/glance/raw/branch/$OPENSTACK_TAG/etc/policy.json && \ diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml index e33dd00b4..b58eab0e1 100644 --- a/docker/smoke/testcases.yaml +++ b/docker/smoke/testcases.yaml @@ -173,7 +173,7 @@ tiers: run: name: tempest_common args: - mode: '^networking_bgpvpn_tempest.tests.api\.' + mode: '^neutron_tempest_plugin.bgpvpn.api\.' neutron_extensions: - bgpvpn option: @@ -192,7 +192,7 @@ tiers: name: tempest_common args: mode: - '^(?:networking_sfc\.tests\.tempest_plugin.tests.api).*$' + '^(?:neutron_tempest_plugin\.sfc\.tests\.api).*$' neutron_extensions: - sfc option: diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index 24adbc49c..766178617 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -336,7 +336,7 @@ tiers: run: name: tempest_common args: - mode: '^networking_bgpvpn_tempest.tests.api\.' + mode: '^neutron_tempest_plugin.bgpvpn.api\.' neutron_extensions: - bgpvpn option: @@ -355,7 +355,7 @@ tiers: name: tempest_common args: mode: - '^(?:networking_sfc\.tests\.tempest_plugin.tests.api).*$' + '^(?:neutron_tempest_plugin\.sfc\.tests\.api).*$' neutron_extensions: - sfc option: diff --git a/upper-constraints.txt b/upper-constraints.txt index 3c3e24f39..92da2855c 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -16,6 +16,4 @@ robotframework-requests===0.5.0 robotframework-sshlibrary===3.3.0 ansible===2.3.2.0 xtesting===0.62.0 -git+https://git.openstack.org/openstack/networking-bgpvpn#egg=networking_bgpvpn -git+https://git.openstack.org/openstack/networking-sfc#egg=networking_sfc bandit===1.1.0 |