diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2019-05-13 17:54:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-05-13 17:54:33 +0000 |
| commit | 0619955a7998868c437a462c9ece3eb1ea7a5277 (patch) | |
| tree | f7dc786b42c1cb99f50f4ba71550e206469e7594 /docker | |
| parent | 6b578b9068164eab33b2cc2d6002f59b9af88f8d (diff) | |
| parent | 8bd9733158239ee3bf24f2f3d75ec108099d7994 (diff) | |
Merge "Stop leveraging on neutron-tempest-plugin package"
Diffstat (limited to 'docker')
| -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 0ba495661..f372601ed 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -4,6 +4,7 @@ ARG BRANCH=master ARG OPENSTACK_TAG=master ARG REFSTACK_TARGET=2018.11 ARG PATROLE_TAG=master +ARG NEUTRON_TEMPEST_TAG=master ARG BARBICAN_TAG=master RUN apk --no-cache add --virtual .build-deps --update \ @@ -18,13 +19,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 && \ @@ -35,7 +41,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 \ /src/neutron && \ apk del .build-deps COPY defcore.txt /home/opnfv/functest/data/refstack/defcore.txt |