From 6a86854b504db5a67b243053bd1916f914b8717d Mon Sep 17 00:00:00 2001 From: Cédric Ollivier 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 --- docker/core/Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docker/core/Dockerfile') diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index fcfc3caf4..ec69df03a 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -13,6 +13,8 @@ RUN apk --no-cache add --update \ case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt && apk add --no-cache py3-pynacl ;; 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 /^tempest==+.*$/d upper-constraints.txt && \ + sed -i -E s/^ujson==+.*$/-e\ git+https:\\/\\/github.com\\/esnme\\/ultrajson@$UJSON_TAG#egg=ujson/ upper-constraints.txt && \ pip3 install --no-cache-dir --src /src -cupper-constraints.opnfv.txt -cupper-constraints.txt \ -e git+https://opendev.org/openstack/requirements@$OPENSTACK_TAG#egg=openstack_requirements && \ git init /src/functest && \ @@ -28,4 +30,7 @@ RUN apk --no-cache add --update \ bash -c "mkdir -p /var/lib/xtesting /home/opnfv" && \ ln -s /var/lib/xtesting /home/opnfv/functest && \ bash -c "mkdir -p /home/opnfv/functest{/conf,/data,/images,/results} /home/opnfv/repos/vnfs" && \ + mkdir -p /etc/rally && \ + printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \ + mkdir -p /var/lib/rally/database && rally db create && \ apk del .build-deps -- cgit 1.2.3-korg