Install Tempest master if OpenStack master

It seems that gates override the upper-constraints in case of Tempest
[1][2].

[1] http://logs.openstack.org/80/585180/3/check/tempest-full/aa8b698/controller/logs/pip2-freeze.txt.gz
[2] http://artifacts.opnfv.org/logs/functest/lf-virtual3/2018-08-08_16-26-16/tempest_smoke/tempest-report.html

JIRA: FUNCTEST-1000

Change-Id: I48530083b453a4a6d6027763210259050b4d0040
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile
index 1d46955..a09a562 100644 (file)
--- a/docker/tempest/Dockerfile
+++ b/docker/tempest/Dockerfile
@@ -8,9 +8,16 @@ ARG OS_FAULTS_TAG=0.1.17
 RUN apk --no-cache add --virtual .build-deps --update \
         python-dev build-base linux-headers libffi-dev \
         openssl-dev libjpeg-turbo-dev && \
-    wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \
-        sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \
-        > upper-constraints.txt && \
+    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:\\/\\/github.com\\/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:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \
+            > upper-constraints.txt ;; \
+    esac && \
     wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH | \
         sed -E /#egg=functest/d > upper-constraints.opnfv.txt && \
     pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \