summaryrefslogtreecommitdiffstats
path: root/docker/smoke/Dockerfile
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-03-21 07:49:34 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2019-03-21 07:50:04 +0100
commit351de747418a8118f254d878d3d73b67922bea6d (patch)
treec708e80d17649c74506aeb6d86c0a4621ddd6b35 /docker/smoke/Dockerfile
parent376b8234ee7dc638b0025ee497fe5d0bda7e832a (diff)
Revert "Allow building containers when refstack.openstack.org is down"
refstack.openstack.org is up! This reverts commit c693862a4014fd444b6f75da62da4cd8c2a088fc. Change-Id: I95326167763e67baccd866a1e61611cd187ec316 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/smoke/Dockerfile')
-rw-r--r--docker/smoke/Dockerfile4
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index eb977a4b9..794a5fcc6 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -4,6 +4,7 @@ ARG BRANCH=stable/gambia
ARG OPENSTACK_TAG=stable/queens
ARG TEMPEST_TAG=3588bb3f5ef546a0ef4d4ad621fd1be381b5fdaf
ARG OSLO_CONCURRENCY=3.27.0
+ARG REFSTACK_TARGET=2018.02
ARG PATROLE_TAG=0.3.0
ARG NEUTRON_TAG=0.2.0
ARG BARBICAN_TAG=0.1.0
@@ -38,6 +39,8 @@ RUN apk --no-cache add --virtual .build-deps --update \
rm -r upper-constraints.txt upper-constraints.opnfv.txt \
/src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin && \
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" \
+ -O /home/opnfv/functest/data/refstack/defcore.txt && \
mkdir -p /etc/neutron /etc/glance && \
wget -q -O /etc/neutron/policy.json https://git.openstack.org/cgit/openstack/neutron/plain/etc/policy.json?h=$OPENSTACK_TAG && \
wget -q -O /etc/glance/policy.json https://git.openstack.org/cgit/openstack/glance/plain/etc/policy.json?h=$OPENSTACK_TAG && \
@@ -49,6 +52,5 @@ RUN apk --no-cache add --virtual .build-deps --update \
cp -r /src/neutron/rally-jobs /home/opnfv/functest/data/rally/neutron/rally-jobs && \
rm -r /src/neutron && \
apk del .build-deps
-COPY defcore.txt /home/opnfv/functest/data/refstack/defcore.txt
COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
CMD ["run_tests", "-t", "all"]