From 0bed33a29da92685dc208b5929de6aefe0c5e5e9 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Wed, 4 Jul 2018 15:20:22 +0200
Subject: Install Robot dependencies in healthcheck
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

old testcase moved to opnfv/functest-healthcheck.

Change-Id: If8e8fc7d8bc9c97602c05e5a4c048461351cc97e
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 docker/healthcheck/Dockerfile                  | 16 +++++++++++++---
 docker/healthcheck/thirdparty-requirements.txt |  3 +++
 docker/smoke/Dockerfile                        |  5 ++---
 docker/smoke/thirdparty-requirements.txt       |  3 ---
 4 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 docker/healthcheck/thirdparty-requirements.txt
 delete mode 100644 docker/smoke/thirdparty-requirements.txt

diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 81cb7f141..e78d81c52 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,10 +1,20 @@
 FROM opnfv/functest-core
 
+ARG BRANCH=master
+ARG OPENSTACK_TAG=stable/queens
 ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4
 
-RUN git clone https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \
+COPY thirdparty-requirements.txt thirdparty-requirements.txt
+RUN 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 && \
+    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 \
+        -rthirdparty-requirements.txt && \
+    git clone https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \
     (cd /src/odl_test && git checkout $ODL_TAG) && \
-    rm -r /src/odl_test/.git
-
+    rm -r /src/odl_test/.git thirdparty-requirements.txt upper-constraints.txt \
+        upper-constraints.opnfv.txt
 COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
 CMD ["run_tests", "-t", "all"]
diff --git a/docker/healthcheck/thirdparty-requirements.txt b/docker/healthcheck/thirdparty-requirements.txt
new file mode 100644
index 000000000..6d7ee1226
--- /dev/null
+++ b/docker/healthcheck/thirdparty-requirements.txt
@@ -0,0 +1,3 @@
+robotframework-httplibrary
+robotframework-requests
+robotframework-sshlibrary;python_version=='2.7'
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 076b1a98c..87b28f0a4 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -5,7 +5,6 @@ ARG OPENSTACK_TAG=stable/queens
 ARG REFSTACK_TARGET=2017.09
 ARG PATROLE_TAG=0.3.0
 
-COPY thirdparty-requirements.txt thirdparty-requirements.txt
 RUN apk --no-cache add --virtual .build-deps --update \
         python-dev build-base linux-headers libffi-dev \
         openssl-dev libjpeg-turbo-dev && \
@@ -22,9 +21,9 @@ RUN apk --no-cache add --virtual .build-deps --update \
     git clone --depth 1 https://github.com/openstack/barbican-tempest-plugin.git /src/barbican-tempest-plugin && \
     update-requirements -s --source /src/openstack-requirements /src/barbican-tempest-plugin/ && \
     pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \
-        /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin -rthirdparty-requirements.txt && \
+        /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin && \
     virtualenv --system-site-packages /src/tempest/.venv && \
-    rm -r upper-constraints.txt upper-constraints.opnfv.txt thirdparty-requirements.txt \
+    rm -r upper-constraints.txt upper-constraints.opnfv.txt \
         /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin && \
     mkdir -p /home/opnfv/functest/data/refstack && \
     wget "https://refstack.openstack.org/api/v1/guidelines/${REFSTACK_TARGET}/tests?target=compute&type=required&alias=true&flag=false" \
diff --git a/docker/smoke/thirdparty-requirements.txt b/docker/smoke/thirdparty-requirements.txt
deleted file mode 100644
index 6d7ee1226..000000000
--- a/docker/smoke/thirdparty-requirements.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-robotframework-httplibrary
-robotframework-requests
-robotframework-sshlibrary;python_version=='2.7'
-- 
cgit 1.2.3-korg