From 6a86854b504db5a67b243053bd1916f914b8717d Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Tue, 9 Jul 2019 17:14:00 +0200
Subject: Remove functest-tempest
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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>
---
docker/smoke/Dockerfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'docker/smoke')
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 547295ad5..800376e53 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-tempest
+FROM opnfv/functest-core
ARG BRANCH=master
ARG OPENSTACK_TAG=master
@@ -11,7 +11,7 @@ RUN 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 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 && \
--
cgit