aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-04-13 17:17:08 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2019-04-13 19:18:00 +0200
commit03c35e95fc852e44f446780d9137fe4c9a3f2ebe (patch)
treec0dce97758c4abbc4549bc2003b48720093c51f4
parent43e0e08bc2a1a294c582bf79300c4ef34242974d (diff)
Stop generating policies for unexecuted services
It saves time when cross-compiling smoke. Then it allows building arm (Raspberry PI) smoke via travis-ci [1]. [1] https://travis-ci.org/collivier/functest/jobs/519630251 Change-Id: Ifbfcc0d726a8f74fd8a861bb52d6ea2543870e0c Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--docker/smoke/Dockerfile10
1 files changed, 2 insertions, 8 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 6162397a9..452d24e67 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -33,18 +33,12 @@ RUN apk --no-cache add --virtual .build-deps --update \
wget -q -O /etc/glance/policy.json https://git.openstack.org/cgit/openstack/glance/plain/etc/policy.json?h=$OPENSTACK_TAG && \
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://git.openstack.org/openstack/neutron.git@$OPENSTACK_TAG#egg=neutron \
- -e git+https://git.openstack.org/openstack/cinder.git@$OPENSTACK_TAG#egg=cinder \
- -e git+https://git.openstack.org/openstack/keystone.git@$OPENSTACK_TAG#egg=keystone \
- -e git+https://git.openstack.org/openstack/nova.git@$OPENSTACK_TAG#egg=nova && \
- oslopolicy-sample-generator --format json --output-file /etc/cinder/policy.json --namespace cinder && \
- oslopolicy-sample-generator --format json --output-file /etc/keystone/policy.json --namespace keystone && \
+ oslo.policy -e git+https://git.openstack.org/openstack/neutron.git@$OPENSTACK_TAG#egg=neutron && \
oslopolicy-sample-generator --format json --output-file /etc/neutron/policy.json --namespace neutron && \
- oslopolicy-sample-generator --format json --output-file /etc/nova/policy.json --namespace nova && \
deactivate && \
rm -r oslo upper-constraints.txt upper-constraints.opnfv.txt \
/src/patrole /src/barbican-tempest-plugin \
- /src/cinder /src/keystone /src/neutron /src/nova && \
+ /src/neutron && \
apk del .build-deps
COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
CMD ["run_tests", "-t", "all"]