X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fbenchmarking%2FDockerfile;h=bcf331483440d008f13d7415a99eb1e2255c5722;hb=6a86854b504db5a67b243053bd1916f914b8717d;hp=dec81b7528ce6ed417b9696ce74b69fcc424ba3e;hpb=0511f7eeacdceb8d9e59fc57f673080bef4095c6;p=functest.git diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index dec81b752..bcf331483 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-tempest +FROM opnfv/functest-core ARG BRANCH=master ARG OPENSTACK_TAG=master @@ -9,7 +9,7 @@ RUN apk --no-cache add --update libxml2 libxslt && \ 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 s/^tempest==+.*$/-e\ git+https:\\/\\/opendev.org\\/openstack\\/tempest#egg=tempest/ 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 && \