aboutsummaryrefslogtreecommitdiffstats
path: root/docker/benchmarking
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-04-20 01:16:48 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2019-04-21 13:36:04 +0200
commit41b859ade7646ef8dad4ba75e5e4615e30213565 (patch)
tree9422f051a4e556bb5329d9a304264550c2fb9e37 /docker/benchmarking
parent12e38180a5be8604ebc5fc8e520b53b61135bbc3 (diff)
Update all OpenStack refs to opendev.org
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 <cedric.ollivier@orange.com> (cherry picked from commit 2ceebaa032f07c4162ed3701c6814dfe5cb683d4)
Diffstat (limited to 'docker/benchmarking')
-rw-r--r--docker/benchmarking/Dockerfile10
1 files changed, 5 insertions, 5 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile
index cf0fc36da..e65909f14 100644
--- a/docker/benchmarking/Dockerfile
+++ b/docker/benchmarking/Dockerfile
@@ -3,20 +3,20 @@ FROM opnfv/functest-tempest:hunter
ARG BRANCH=stable/hunter
ARG OPENSTACK_TAG=stable/rocky
ARG TEMPEST_TAG=3588bb3f5ef546a0ef4d4ad621fd1be381b5fdaf
-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 && \
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 && \
CFLAGS="-O0" pip install --no-cache-dir -cupper-constraints.txt -cupper-constraints.opnfv.txt lxml && \
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 \
@@ -24,7 +24,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://git.openstack.org/openstack/neutron.git $OPENSTACK_TAG && \
+ git fetch --tags https://opendev.org/openstack/neutron.git $OPENSTACK_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 && \