aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-05-11 21:34:09 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2019-05-11 21:50:43 +0200
commitad3350b9b25aed013e2a0e5b52f6916e6e8268cb (patch)
treec290a27d8d6b172c4454a045e055205e372cd1b2
parent7876551e1f495636aa9be3bb4c3ac69c88f54ade (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> (cherry picked from commit 8bd9733158239ee3bf24f2f3d75ec108099d7994)
-rw-r--r--docker/smoke/Dockerfile10
1 files changed, 8 insertions, 2 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 568646e14..5488f2252 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -5,6 +5,7 @@ ARG OPENSTACK_TAG=stable/stein
ARG TEMPEST_TAG=20.0.0
ARG REFSTACK_TARGET=2018.11
ARG PATROLE_TAG=0.5.0
+ARG NEUTRON_TEMPEST_TAG=0.3.0
ARG BARBICAN_TAG=0.1.0
RUN apk --no-cache add --virtual .build-deps --update \
@@ -19,13 +20,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" \
@@ -38,7 +44,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 && \
apk del .build-deps
COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
CMD ["run_tests", "-t", "all"]