diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-08-09 00:44:56 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-08-09 00:57:49 +0200 |
| commit | 215742d74eaa788c26bfabcaa8e5a368875692c1 (patch) | |
| tree | a5dc53394894908e339ec09f78048d7f688c3df4 | |
| parent | 71909b5eef3fc7b9fc8b75acdc80cfa49291ecb5 (diff) | |
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>
| -rw-r--r-- | docker/tempest/Dockerfile | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile index 1d46955fe..a09a562fd 100644 --- 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 \ |