summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-09-13 11:39:36 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-09-13 11:40:39 +0200
commit87c10e9cf852ff065592084f3126d2c211aa5d56 (patch)
tree9745ae6f91b5174b1a7b7bab471eb19399691653
parent66a9c392be9db320f0d2ddf21635d2a763d5911b (diff)
Remove former logic for tempest
It's now useless as Functest master conform with OpenStack master. Change-Id: Ibb08d40a721a9fa114967c6a504804b641b4a881 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--docker/tempest/Dockerfile12
1 files changed, 3 insertions, 9 deletions
diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile
index a683767d6..162a34225 100644
--- a/docker/tempest/Dockerfile
+++ b/docker/tempest/Dockerfile
@@ -10,15 +10,9 @@ RUN apk --no-cache add --virtual .build-deps --update \
python-dev build-base linux-headers libffi-dev \
openssl-dev libjpeg-turbo-dev && \
case $OPENSTACK_TAG in \
- master) \
- wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \
- sed -E s/^tempest==+.*$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest#egg=tempest/ \
- > upper-constraints.txt ;; \
- *) \
- wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \
- sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest@\\1#egg=tempest/ \
- > upper-constraints.txt ;; \
- esac && \
+ wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \
+ sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest@\\1#egg=tempest/ \
+ > upper-constraints.txt && \
wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH | \
sed -E /#egg=functest/d > upper-constraints.opnfv.txt && \
git init /src/os-faults && \