aboutsummaryrefslogtreecommitdiffstats
path: root/docker/smoke
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-04-22 10:39:45 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2019-04-22 10:41:44 +0200
commitef9f38c1061a08fd70bbba4b4cda68e99d945cbf (patch)
treef54ddbd5b3705174dbc23eef31efe445c1852fa5 /docker/smoke
parenta68027076e0bca4e3bc69371a9f2e9ac486cdbf5 (diff)
Install neutron package due to upper-constraints
SFC requires constraints about neutron. We do switch to packages instead of cloning repos when generating policy files [1]. [1] https://build.opnfv.org/ci/view/functest%20(Installer%20gates)/job/functest-docker-iruya/25/ Change-Id: Ia2e8a1aa704372e543e9e967ba90e6d9e5db6c9a Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/smoke')
-rw-r--r--docker/smoke/Dockerfile5
1 files changed, 2 insertions, 3 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 6b8a4add0..568646e14 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -34,12 +34,11 @@ RUN apk --no-cache add --virtual .build-deps --update \
wget -q -O /etc/glance/policy.json https://opendev.org/openstack/glance/raw/branch/$OPENSTACK_TAG/etc/policy.json && \
virtualenv --no-pip --no-setuptools --no-wheel oslo && . oslo/bin/activate && \
pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \
- oslo.policy -e git+https://opendev.org/openstack/neutron.git@$OPENSTACK_TAG#egg=neutron && \
+ oslo.policy neutron && \
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/neutron && \
+ /src/patrole /src/barbican-tempest-plugin && \
apk del .build-deps
COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
CMD ["run_tests", "-t", "all"]