From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 7 Aug 2017 20:50:06 +0000 (+0200)
Subject: Integrate the netready package
X-Git-Tag: 0.2~448^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d89319b96cca05977c9442f496a31c2cdf6a67dc;p=functest-xtesting.git

Integrate the netready package

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>
---

diff --git a/docker/Dockerfile b/docker/Dockerfile
index cb795716..54d526d6 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 48b1468d..0fed95de 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 0fa9be36..abc53119 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 84521f23..e720cad1 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
diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 31ce4b90..679140fe 100644
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -7,7 +7,6 @@ general:
         dir_repo_releng:    /home/opnfv/repos/releng
         repo_vims_test:     /home/opnfv/repos/vnfs/vims-test
         repo_onos:          /home/opnfv/repos/onos
-        repo_netready:      /home/opnfv/repos/netready
         repo_barometer:     /home/opnfv/repos/barometer
         repo_doctor:        /home/opnfv/repos/doctor
         repo_odl_test:      /src/odl_test
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 42689d1e..dc48df75 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -428,7 +428,7 @@ tiers:
                     module: 'functest.core.feature'
                     class: 'BashFeature'
                     args:
-                        cmd: 'cd /home/opnfv/repos/netready/test/functest && python ./gluon-test-suite.py'
+                        cmd: 'gluon-test-suite.py'
 
             -
                 case_name: barometercollectd
diff --git a/upper-constraints.txt b/upper-constraints.txt
index 29b00e59..15d81ee7 100644
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -6,6 +6,7 @@ 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
 git+https://gerrit.opnfv.org/gerrit/promise#egg=promise&subdirectory=promise/test/functest
+git+https://gerrit.opnfv.org/gerrit/netready#egg=netready&subdirectory=test/functest
 -e git+https://github.com/openstack/refstack-client#egg=refstack-client
 cloudify_rest_client===4.0
 iniparse===0.4