From bde3bcb27574b5ace25021de5ed2303161995cc9 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Fri, 7 Jul 2017 20:09:41 +0200
Subject: Add upper-constraints.txt for Functest
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It completes OpenStack's upper-constraints.txt by adding Functest's
requirements.

This file is temporarily duplicated to allow building the containers.
It will be removed via a next patch when this patch is merged.

openbaton-cli could be updated (e.g. 3.2.8).

Change-Id: I26de2d22f9e8973c5a58c3cc5129142fa628e57a
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 docker/core/Dockerfile            |  9 ++++-----
 docker/core/upper-constraints.txt | 17 +++++++++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 docker/core/upper-constraints.txt

(limited to 'docker/core')

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 4f3210d7c..4aa9e5c41 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,5 +1,6 @@
 FROM alpine:3.6
 
+COPY upper-constraints.txt upper-constraints.txt
 RUN apk --no-cache add --update \
         python libffi libssl1.0 libjpeg-turbo py-pip bash \
         grep sed wget ca-certificates git && \
@@ -8,12 +9,10 @@ RUN apk --no-cache add --update \
         openssl-dev libjpeg-turbo-dev && \
     wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata | \
         sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \
-        > upper-constraints.txt && \
-    pip install --src /src -cupper-constraints.txt \
-        git+https://gerrit.opnfv.org/gerrit/releng#egg=opnfv\&subdirectory=modules \
-        git+https://gerrit.opnfv.org/gerrit/snaps#egg=snaps \
+        > o-upper-constraints.txt && \
+    pip install --src /src -cupper-constraints.txt -co-upper-constraints.txt \
         git+https://gerrit.opnfv.org/gerrit/functest#egg=functest && \
-    rm upper-constraints.txt && \
+    rm upper-constraints.txt o-upper-constraints.txt && \
     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-manage db create && \
diff --git a/docker/core/upper-constraints.txt b/docker/core/upper-constraints.txt
new file mode 100644
index 000000000..73ec7f41b
--- /dev/null
+++ b/docker/core/upper-constraints.txt
@@ -0,0 +1,17 @@
+git+https://gerrit.opnfv.org/gerrit/releng#egg=opnfv&subdirectory=modules
+git+https://gerrit.opnfv.org/gerrit/snaps#egg=snaps
+git+https://gerrit.opnfv.org/gerrit/barometer#egg=baro_tests
+git+https://gerrit.opnfv.org/gerrit/sdnvpn#egg=sdnvpn
+git+https://gerrit.opnfv.org/gerrit/opera#egg=opera
+git+https://gerrit.opnfv.org/gerrit/securityscanning#egg=securityscanning
+git+https://gerrit.opnfv.org/gerrit/sfc#egg=sfc
+-e git+https://github.com/openstack/refstack-client#egg=refstack-client
+cloudify_rest_client===4.0
+iniparse===0.4
+openbaton-cli===2.2.1b7
+robotframework===3.0.2
+robotframework-httplibrary===0.4.2
+robotframework-requests===0.4.7
+robotframework-sshlibrary===2.1.3;python_version=='2.7'
+kingbird===1.1.0
+rally===0.9.1
-- 
cgit 1.2.3-korg