diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2019-05-11 21:34:09 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-05-11 21:41:02 +0200 |
| commit | 8bd9733158239ee3bf24f2f3d75ec108099d7994 (patch) | |
| tree | 92489b6a04cd643ee6f68e192e7d18af3bf210bc | |
| parent | d4178d425312497412e9832fb6cb1a074e5099f3 (diff) | |
Stop leveraging on neutron-tempest-plugin package
It reverts "Take new upper-constraints into account" [1] to follow the
upstream revert [2].
[1] https://github.com/opnfv/functest/commit/14534c4ea68ee84645f8b1ddd836ed684a808385
[2] https://github.com/openstack/requirements/commit/ea2cfe661785c838991aa64b64e59aec245a0c0e
Change-Id: I7085679ff6b04726842289133e526aaed87a416c
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | docker/smoke/Dockerfile | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index ad15f5d16..3703f3b67 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -4,6 +4,7 @@ ARG BRANCH=master ARG OPENSTACK_TAG=master ARG REFSTACK_TARGET=2018.11 ARG PATROLE_TAG=master +ARG NEUTRON_TEMPEST_TAG=master ARG BARBICAN_TAG=master RUN apk --no-cache add --virtual .build-deps --update \ @@ -18,13 +19,18 @@ RUN apk --no-cache add --virtual .build-deps --update \ git fetch --tags https://opendev.org/openstack/patrole.git $PATROLE_TAG && \ git checkout FETCH_HEAD) && \ update-requirements -s --source /src/openstack-requirements /src/patrole/ && \ + git init /src/neutron-tempest-plugin && \ + (cd /src/neutron-tempest-plugin && \ + git fetch --tags https://git.openstack.org/openstack/neutron-tempest-plugin.git $NEUTRON_TEMPEST_TAG && \ + git checkout FETCH_HEAD) && \ + update-requirements -s --source /src/openstack-requirements /src/neutron-tempest-plugin && \ git init /src/barbican-tempest-plugin && \ (cd /src/barbican-tempest-plugin && \ git fetch --tags https://opendev.org/openstack/barbican-tempest-plugin.git $BARBICAN_TAG && \ git checkout FETCH_HEAD) && \ update-requirements -s --source /src/openstack-requirements /src/barbican-tempest-plugin/ && \ pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ - /src/patrole /src/barbican-tempest-plugin neutron-tempest-plugin \ + /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin \ networking-bgpvpn networking-sfc && \ mkdir -p /home/opnfv/functest/data/refstack && \ wget "https://refstack.openstack.org/api/v1/guidelines/${REFSTACK_TARGET}/tests?target=compute&type=required&alias=true&flag=false" \ @@ -37,7 +43,7 @@ RUN apk --no-cache add --virtual .build-deps --update \ oslopolicy-sample-generator --format json --output-file /etc/neutron/policy.json --namespace neutron && \ deactivate && \ rm -r oslo upper-constraints.txt upper-constraints.opnfv.txt \ - /src/patrole /src/barbican-tempest-plugin \ + /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin \ /src/neutron && \ apk del .build-deps COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml |