X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fbenchmarking%2FDockerfile;h=31a6c630b170285fcf045afa107a6d5a2851b166;hb=75d581a9d3ec7c11a9a696db4b271c2691c28f15;hp=17dc0fc0c27cb5a6f0babcac8e86ff16cde31ac4;hpb=9c4920827a243ca0982016664cf150a5221855b2;p=functest.git diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index 17dc0fc0c..31a6c630b 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -2,20 +2,20 @@ FROM opnfv/functest-tempest ARG BRANCH=master ARG OPENSTACK_TAG=master -ARG VMTP_TAG=99b261ccccc2f8a08ee2d8fca9f54ef9d69899d7 +ARG VMTP_TAG=2.5.0 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#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#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 \ @@ -23,7 +23,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 && \