diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2019-05-13 17:55:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-05-13 17:55:22 +0000 |
| commit | da2ffdefb2e660f77cc20b64d2590e0927230911 (patch) | |
| tree | daf7ce841a0a57fe182fa88ce74393e6eba48f16 /docker/smoke | |
| parent | f624d474e6581f5781ecdc8d008d274c2535b702 (diff) | |
| parent | ad3350b9b25aed013e2a0e5b52f6916e6e8268cb (diff) | |
Merge "Stop leveraging on neutron-tempest-plugin package" into stable/iruya
Diffstat (limited to 'docker/smoke')
| -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 55df2883d..949a52a8f 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 && \ mkdir -p /etc/neutron /etc/cinder /etc/glance /etc/keystone /etc/nova && \ @@ -36,7 +42,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 defcore.txt /home/opnfv/functest/data/refstack/defcore.txt COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml |