aboutsummaryrefslogtreecommitdiffstats
path: root/docker/features
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-07-09 17:14:00 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2019-07-09 22:10:02 +0200
commit6a86854b504db5a67b243053bd1916f914b8717d (patch)
treedf0187a3a499f3bfc0ad45ba602c89db93efcbc3 /docker/features
parent0511f7eeacdceb8d9e59fc57f673080bef4095c6 (diff)
Remove functest-tempest
Functest Kubernetes directly calls Rally API which force dependencies to rally and its plugins. Then it installs rally, rally-openstack and xrally-kubernetes as Functest dependencies. Change-Id: I18e0c2ba30588707beba1746aa4bfbc1ab7509c6 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/features')
-rw-r--r--docker/features/Dockerfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index 5cd87b422..f41a0a000 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/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 sshpass && \
python3-dev build-base linux-headers libffi-dev \
openssl-dev libjpeg-turbo-dev file && \
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 && \