From 7a73e259bfcdc1c8461a8775629330858df94b3e Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sat, 20 Apr 2019 01:16:48 +0200 Subject: Update all OpenStack refs to opendev.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All gates are failing due wrong to redirections (see os-faults [1][2]). [1] https://build.opnfv.org/ci/job/functest-opnfv-functest-tempest-latest-gate/96/console [2] https://travis-ci.org/collivier/functest/builds/522071220 Change-Id: I5a8ca67f0d95df24daa9bdca2f23eb13d896f9d5 Signed-off-by: Cédric Ollivier (cherry picked from commit 2ceebaa032f07c4162ed3701c6814dfe5cb683d4) --- docker/benchmarking/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'docker/benchmarking') diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index c5afc3a23..38c295eca 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -4,25 +4,25 @@ ARG BRANCH=stable/gambia ARG OPENSTACK_TAG=stable/queens ARG TEMPEST_TAG=3588bb3f5ef546a0ef4d4ad621fd1be381b5fdaf ARG OSLO_CONCURRENCY=3.27.0 -ARG VMTP_TAG=99b261ccccc2f8a08ee2d8fca9f54ef9d69899d7 +ARG VMTP_TAG=2.4.8 RUN apk --no-cache add --update libxml2 libxslt && \ 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 && \ - wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG > upper-constraints.txt && \ - sed -i -E s/^tempest==+.*$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest@$TEMPEST_TAG#egg=tempest/ upper-constraints.txt && \ + wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \ + sed -i -E s/^tempest==+.*$/-e\ git+https:\\/\\/opendev.org\\/openstack\\/tempest@$TEMPEST_TAG#egg=tempest/ upper-constraints.txt && \ sed -i -E s/^oslo.concurrency==+.*$/oslo.concurrency===$OSLO_CONCURRENCY/ upper-constraints.txt && \ wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \ sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \ git init /src/vmtp && \ (cd /src/vmtp && \ - git fetch --tags https://git.openstack.org/openstack/vmtp.git $VMTP_TAG && \ + git fetch --tags https://opendev.org/x/vmtp.git $VMTP_TAG && \ git checkout FETCH_HEAD) && \ update-requirements -s --source /src/openstack-requirements /src/vmtp/ && \ pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ /src/vmtp && \ - rm -r upper-constraints.txt upper-constraints.opnfv.txt src/vmtp && \ + rm -r upper-constraints.txt upper-constraints.opnfv.txt /src/vmtp && \ apk del .build-deps COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] -- cgit 1.2.3-korg