diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-09-02 12:20:26 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-09-02 18:10:51 +0200 |
| commit | 8f8f600106c038138845b3ddc527aebc9055f4a8 (patch) | |
| tree | 5a987f558dc26932cc609d350c2c48d6571554da /docker/smoke/Dockerfile | |
| parent | 4151722a50e5cd821113183bf4a88d1e8c0ee877 (diff) | |
Move shaker and vmtp into functest-benchmarking
It also updates all jobs and fixes Dockerhub hooks.
Change-Id: Ib182155736b4dbdb829293081741a9d5cb8ea6d7
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/smoke/Dockerfile')
| -rw-r--r-- | docker/smoke/Dockerfile | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 7e4939a41..fcddb8451 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -4,14 +4,12 @@ ARG BRANCH=master ARG OPENSTACK_TAG=stable/queens ARG REFSTACK_TARGET=2018.02 ARG PATROLE_TAG=0.3.0 -ARG VMTP_TAG=99b261ccccc2f8a08ee2d8fca9f54ef9d69899d7 ARG NEUTRON_TAG=d307f5635d4015e7842a4a177f66c76ba4bd818a ARG BARBICAN_TAG=b8bf147bdcdd33f3ad276ca8815fd253ec9b24af -RUN apk --no-cache add --update libxml2 libxslt && \ - apk --no-cache add --virtual .build-deps --update \ +RUN apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ - openssl-dev libjpeg-turbo-dev libxml2-dev libxslt-dev && \ + openssl-dev libjpeg-turbo-dev && \ wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \ sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest@\\1#egg=tempest/ \ > upper-constraints.txt && \ @@ -20,9 +18,6 @@ RUN apk --no-cache add --update libxml2 libxslt && \ git clone --depth 1 https://git.openstack.org/openstack/patrole.git /src/patrole && \ (cd /src/patrole && git fetch --tags origin $PATROLE_TAG && git checkout FETCH_HEAD) && \ update-requirements -s --source /src/openstack-requirements /src/patrole/ && \ - git clone https://git.openstack.org/openstack/vmtp.git /src/vmtp && \ - (cd /src/vmtp && git fetch origin --tags $VMTP_TAG && git checkout FETCH_HEAD) && \ - update-requirements -s --source /src/openstack-requirements /src/vmtp/ && \ git clone https://git.openstack.org/openstack/neutron-tempest-plugin.git /src/neutron-tempest-plugin && \ (cd /src/neutron-tempest-plugin && git fetch --tags origin $NEUTRON_TAG && git checkout FETCH_HEAD) && \ update-requirements -s --source /src/openstack-requirements /src/neutron-tempest-plugin && \ @@ -31,9 +26,9 @@ RUN apk --no-cache add --update libxml2 libxslt && \ 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 /src/neutron-tempest-plugin \ - networking-bgpvpn networking-sfc /src/vmtp && \ + networking-bgpvpn networking-sfc && \ rm -r upper-constraints.txt upper-constraints.opnfv.txt \ - /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin /src/vmtp && \ + /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 && \ |