diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-02-17 00:10:07 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-02-17 00:10:07 +0100 |
| commit | 7fcc3662120b04b2c76ca40d8c4c660a2110b615 (patch) | |
| tree | 8ea218c7d6f846d31c7ab11e3b72f55bbc223f62 /docker/benchmarking/Dockerfile | |
| parent | d338103023b7d59f1a23200dafcf28c40a0d3d36 (diff) | |
Bypass upstream requirement issues
https://review.opendev.org/#/c/708041/
Change-Id: Iebbf0a720fe9d1c62083028d0bc0078bf7680753
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/benchmarking/Dockerfile')
| -rw-r--r-- | docker/benchmarking/Dockerfile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index f53f22b10..e16e29e1f 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -1,14 +1,15 @@ FROM opnfv/functest-core ARG BRANCH=master -ARG OPENSTACK_TAG=master +ARG OPENSTACK_TAG=1843927ab31a6cc8b4313f786175da3ea2767a00 ARG VMTP_TAG=master +ARG NEUTRON_TAG=master RUN apk --no-cache add --update libxml2 libxslt && \ apk --no-cache add --virtual .build-deps --update \ python3-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev libxml2-dev libxslt-dev && \ - wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \ + wget -q -O- https://opendev.org/openstack/requirements/raw/commit/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \ sed -i -E /^tempest==+.*$/d upper-constraints.txt && \ case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt ;; esac && \ wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \ @@ -25,7 +26,7 @@ RUN apk --no-cache add --update libxml2 libxslt && \ mkdir -p /home/opnfv/functest/data/rally/neutron && \ git init /src/neutron && \ (cd /src/neutron && \ - git fetch --tags https://opendev.org/openstack/neutron.git $OPENSTACK_TAG && \ + git fetch --tags https://opendev.org/openstack/neutron.git $NEUTRON_TAG && \ git checkout FETCH_HEAD) && \ cp -r /src/neutron/rally-jobs /home/opnfv/functest/data/rally/neutron/rally-jobs && \ rm -r upper-constraints.txt upper-constraints.opnfv.txt /src/vmtp /src/neutron && \ |