diff options
Diffstat (limited to 'docker/benchmarking/Dockerfile')
| -rw-r--r-- | docker/benchmarking/Dockerfile | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index cc1b5a81e..fa33a82bd 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -1,7 +1,5 @@ FROM opnfv/functest-core:kali -ARG BRANCH=stable/kali -ARG OPENSTACK_TAG=stable/ussuri ARG VMTP_TAG=34a82c9f3598ec7f5d8de0a6d5139b92931db4cc ARG NEUTRON_TAG=stable/ussuri @@ -9,20 +7,16 @@ 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 && \ - 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 && \ - sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \ - sed -i -E /#egg=rally/d upper-constraints.opnfv.txt && \ - case $(uname -m) in aarch*|arm*) CFLAGS="-O0" pip3 install --no-cache-dir -cupper-constraints.txt -cupper-constraints.opnfv.txt lxml ;; esac && \ + case $(uname -m) in aarch*|arm*) CFLAGS="-O0" \ + pip3 install --no-cache-dir -c/src/requirements/upper-constraints.txt \ + -c/src/functest/upper-constraints.txt lxml ;; esac && \ git init /src/vmtp && \ (cd /src/vmtp && \ git fetch --tags https://review.opendev.org/x/vmtp.git $VMTP_TAG && \ git checkout FETCH_HEAD) && \ - update-requirements -s --source /src/openstack-requirements /src/vmtp/ && \ - sed -i -E s/^tempest==+.*$/-e\ git+https:\\/\\/opendev.org\\/openstack\\/tempest#egg=tempest/ upper-constraints.txt && \ - pip3 install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ + update-requirements -s --source /src/requirements /src/vmtp/ && \ + pip3 install --no-cache-dir --src /src -c/src/requirements/upper-constraints.txt \ + -c/src/functest/upper-constraints.txt \ /src/vmtp && \ mkdir -p /home/opnfv/functest/data/rally/neutron && \ git init /src/neutron && \ @@ -30,7 +24,7 @@ RUN apk --no-cache add --update libxml2 libxslt && \ 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 && \ + rm -r /src/vmtp /src/neutron && \ apk del .build-deps COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] |