From d89319b96cca05977c9442f496a31c2cdf6a67dc Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 7 Aug 2017 22:50:06 +0200
Subject: Integrate the netready package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It also adds the related testcases in functest-features.

Change-Id: I584da9d890622c1bdd2ace0b12b4be37250fda56
Depends-On: I3842e6828f60972cb1df0bc15f849cd08badd895
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 docker/Dockerfile                           |  1 -
 docker/features/testcases.yaml              | 17 +++++++++++++++++
 docker/features/thirdparty-requirements.txt |  1 +
 docker/thirdparty-requirements.txt          |  1 +
 4 files changed, 19 insertions(+), 1 deletion(-)

(limited to 'docker')

diff --git a/docker/Dockerfile b/docker/Dockerfile
index cb7957163..54d526d67 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -87,7 +87,6 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper /src/copper
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/domino /src/domino
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/doctor ${REPOS_DIR}/doctor
-RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/netready ${REPOS_DIR}/netready
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/fds /src/fds
 
 # other repositories
diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml
index 48b1468df..0fed95dee 100644
--- a/docker/features/testcases.yaml
+++ b/docker/features/testcases.yaml
@@ -91,6 +91,23 @@ tiers:
                     args:
                         cmd: 'cd /src/domino && ./tests/run_multinode.sh'
 
+            -
+                case_name: gluon_vping
+                enabled: false
+                project_name: netready
+                criteria: 100
+                blocking: false
+                description: >-
+                    Test suite from Netready project.
+                dependencies:
+                    installer: 'apex'
+                    scenario: 'gluon'
+                run:
+                    module: 'functest.core.feature'
+                    class: 'BashFeature'
+                    args:
+                        cmd: 'gluon-test-suite.py'
+
             -
                 case_name: barometercollectd
                 enabled: false
diff --git a/docker/features/thirdparty-requirements.txt b/docker/features/thirdparty-requirements.txt
index 0fa9be36c..abc53119a 100644
--- a/docker/features/thirdparty-requirements.txt
+++ b/docker/features/thirdparty-requirements.txt
@@ -3,3 +3,4 @@ sdnvpn
 securityscanning
 sfc
 promise
+netready
diff --git a/docker/thirdparty-requirements.txt b/docker/thirdparty-requirements.txt
index 84521f233..e720cad1f 100644
--- a/docker/thirdparty-requirements.txt
+++ b/docker/thirdparty-requirements.txt
@@ -4,6 +4,7 @@ opera
 securityscanning
 sfc
 promise
+netready
 tosca-parser>=0.7.0 # Apache-2.0
 heat-translator>=0.4.0 # Apache-2.0
 refstack-client
-- 
cgit 1.2.3-korg