From ad6735ec4d19286c28903f9375153b1cfbef0fdc Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 2 Apr 2020 18:54:58 +0200 Subject: Keep the modified tempest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit http://artifacts.opnfv.org/functest/CRY58ZS3031L/functest-ovn-opnfv-functest-healthcheck-jerma-tempest_smoke-run-37/tempest_smoke/tempest-report.html Change-Id: I9598a45b09151fa267294716f70e65e3050f0239 Signed-off-by: Cédric Ollivier (cherry picked from commit 21b512e55eb36e38160b697baae44c464fce9034) --- docker/benchmarking/Dockerfile | 1 + docker/healthcheck/Dockerfile | 1 + docker/smoke/Dockerfile | 1 + docker/vnf/Dockerfile | 1 + 4 files changed, 4 insertions(+) (limited to 'docker') diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index 715aab1a5..9a688ac34 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -14,6 +14,7 @@ RUN apk --no-cache add --update libxml2 libxslt && \ 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=tempest/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 && \ git init /src/vmtp && \ (cd /src/vmtp && \ diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index 885d501b2..faf752460 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -13,6 +13,7 @@ RUN apk --no-cache add --virtual .build-deps --update \ 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=tempest/d upper-constraints.opnfv.txt && \ git init /src/tempest-horizon && \ (cd /src/tempest-horizon && \ git fetch --tags https://opendev.org/openstack/tempest-horizon.git $TEMPEST_HORIZON_TAG && \ diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index c0eec437f..a40adb51a 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -20,6 +20,7 @@ RUN apk --no-cache add --update libxml2 libxslt && \ 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=tempest/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 && \ git init /src/patrole && \ (cd /src/patrole && \ diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index b59a97574..9d1c4d776 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -28,6 +28,7 @@ RUN apk --no-cache add --update \ 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=tempest/d upper-constraints.opnfv.txt && \ git clone --depth 1 -b $VIMS_TEST_TAG https://github.com/Metaswitch/clearwater-live-test /src/vims-test && \ sed -i s/unf_ext\ \(.*\)/unf_ext\ \(0.0.7.4\)/g /src/vims-test/Gemfile.lock && \ git init /src/vims-test/quaff && \ -- cgit 1.2.3-korg