aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-04-02 22:20:10 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-04-02 22:20:57 +0200
commitc4b19b547e7e0aa181a60fb4afc05315dc75210e (patch)
treedcd022b143018ad5fc8ca076dde0a06d0fc4992b /docker
parentad6735ec4d19286c28903f9375153b1cfbef0fdc (diff)
Revert "Keep the modified tempest"
It's simply useless and may raise side effects later. Change-Id: Idaeab672480597ed39a5e29719580fee38aeb4ad Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/benchmarking/Dockerfile1
-rw-r--r--docker/healthcheck/Dockerfile1
-rw-r--r--docker/smoke/Dockerfile1
-rw-r--r--docker/vnf/Dockerfile1
4 files changed, 0 insertions, 4 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile
index 9a688ac34..715aab1a5 100644
--- a/docker/benchmarking/Dockerfile
+++ b/docker/benchmarking/Dockerfile
@@ -14,7 +14,6 @@ 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 faf752460..885d501b2 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -13,7 +13,6 @@ 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 a40adb51a..c0eec437f 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -20,7 +20,6 @@ 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 9d1c4d776..b59a97574 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -28,7 +28,6 @@ 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 && \