Exclude Moon feature for Danube

Moon will come back mid March with a micro service version
Moon testing could be enabled on this new version

Change-Id: I160fab5d609bad2b0e8a8c81a4a180498c935b2f
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1cc2209..bb469ae 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -77,7 +77,6 @@ RUN git config --global http.sslVerify false
 # OPNFV repositories
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/functest ${REPOS_DIR}/functest
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper ${REPOS_DIR}/copper
-RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/moon ${REPOS_DIR}/moon
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/sdnvpn ${REPOS_DIR}/sdnvpn
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/domino ${REPOS_DIR}/domino
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/parser ${REPOS_DIR}/parser
@@ -136,7 +135,6 @@ RUN cd ${REPOS_DIR}/sdnvpn && pip install .
 
 RUN cd ${REPOS_DIR}/bgpvpn && pip install .
 #RUN cd ${REPOS_DIR}/kingbird && pip install -e .
-RUN cd ${REPOS_DIR}/moon/moonclient/ && python setup.py install
 
 RUN /bin/bash -c ". /etc/profile.d/rvm.sh \
     && cd ${REPOS_VNFS_DIR}/vims-test \

diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64
index a492bae..d1c44e3 100644 (file)
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@ -78,7 +78,6 @@ RUN git config --global http.sslVerify false
 # OPNFV repositories
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/functest ${REPOS_DIR}/functest
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper ${REPOS_DIR}/copper
-RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/moon ${REPOS_DIR}/moon
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/sdnvpn ${REPOS_DIR}/sdnvpn
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/domino ${REPOS_DIR}/domino
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/parser ${REPOS_DIR}/parser
@@ -133,7 +132,6 @@ RUN cd ${REPOS_DIR}/sdnvpn && pip install .
 
 RUN cd ${REPOS_DIR}/bgpvpn && pip install .
 #RUN cd ${REPOS_DIR}/kingbird && pip install -e .
-RUN cd ${REPOS_DIR}/moon/moonclient/ && python setup.py install
 
 RUN /bin/bash -c ". /etc/profile.d/rvm.sh \
     && cd ${REPOS_VNFS_DIR}/vims-test \

diff --git a/docs/configguide/configguide.rst b/docs/configguide/configguide.rst
index c03760c..08e089c 100644 (file)
--- a/docs/configguide/configguide.rst
+++ b/docs/configguide/configguide.rst
@@ -331,7 +331,6 @@ should now be in place::
             |-- domino
             |-- functest
             |-- kingbird
-            |-- moon
             |-- odl_test
             |-- onos
             |-- ovno

diff --git a/docs/devguide/index.rst b/docs/devguide/index.rst
index 21af912..42ad044 100644 (file)
--- a/docs/devguide/index.rst
+++ b/docs/devguide/index.rst
@@ -104,7 +104,6 @@ The external test cases are:
  * onos
  * bgpvpn
  * copper
- * moon
  * security_scan
  * sfc-odl
  * sfc-onos
@@ -556,8 +555,6 @@ A jenkins job manages:
    +---------------------+---------+---------+---------+---------+
    | parser              |         |         |    X    |         |
    +---------------------+---------+---------+---------+---------+
-   | moon                |         |    X    |         |         |
-   +---------------------+---------+---------+---------+---------+
    | copper              |    X    |         |         |    X    |
    +---------------------+---------+---------+---------+---------+
 
@@ -590,7 +587,7 @@ A jenkins job manages:
   stable) and then the number of iterations (4 needed) would not be
   sufficient to get the green status.
 
-  Please note that other test cases (e.g. sfc_odl, bgpvpn, moon) need also
+  Please note that other test cases (e.g. sfc_odl, bgpvpn) need also
   ODL configuration addons and as a consequence specific scenario.
   There are not considered as runnable on the generic odl_l2 scenario.
 

diff --git a/docs/userguide/index.rst b/docs/userguide/index.rst
index 7e821a8..9436de2 100644 (file)
--- a/docs/userguide/index.rst
+++ b/docs/userguide/index.rst
@@ -372,7 +372,6 @@ Please refer to the dedicated feature user guides for details:
  * copper: http://artifacts.opnfv.org/copper/danube/docs/userguide/index.html
  * doctor: http://artifacts.opnfv.org/doctor/danube/userguide/index.html
  * domino: http://artifacts.opnfv.org/domino/docs/userguide-single/index.html
- * moon: http://artifacts.opnfv.org/moon/docs/userguide/index.html
  * multisites: http://artifacts.opnfv.org/multisite/docs/userguide/index.html
  * onos-sfc: http://artifacts.opnfv.org/onosfw/danube/userguide/index.html
  * odl-sfc: http://artifacts.opnfv.org/sfc/danube/userguide/index.html

diff --git a/docs/userguide/introduction.rst b/docs/userguide/introduction.rst
index e5a090e..4dfe793 100644 (file)
--- a/docs/userguide/introduction.rst
+++ b/docs/userguide/introduction.rst
@@ -149,10 +149,6 @@ validate the scenario for the release.
 |             |               | multisites     | Multisites                       |
 |             |               |                | See `Multisite User Guide`_ for  |
 |             |               |                | details                          |
-|             |               +----------------+----------------------------------+
-|             |               | moon           | Security management system       |
-|             |               |                | See `Moon User Guide`_ for       |
-|             |               |                | details                          |
 +-------------+---------------+----------------+----------------------------------+
 | VNF         | vnf           | cloudify_ims   | Example of a real VNF deployment |
 |             |               |                | to show the NFV capabilities of  |
@@ -257,4 +253,3 @@ section `Executing the functest suites`_ of this document.
 .. _`Functest Dashboard`: http://testresults.opnfv.org/kibana_dashboards/
 .. _`SFC User Guide`: http://artifacts.opnfv.org/sfc/colorado/userguide/index.html
 .. _`Multisite User Guide`: http://artifacts.opnfv.org/multisite/docs/userguide/index.html
-.. _`Moon User Guide`: http://artifacts.opnfv.org/moon/docs/userguide/index.html

diff --git a/docs/userguide/runfunctest.rst b/docs/userguide/runfunctest.rst
index ecf3a20..b5c7191 100644 (file)
--- a/docs/userguide/runfunctest.rst
+++ b/docs/userguide/runfunctest.rst
@@ -287,7 +287,7 @@ variables:
  * The scenario [controller]-[feature]-[mode], stored in DEPLOY_SCENARIO with
 
    * controller = (odl|onos|ocl|nosdn)
-   * feature = (ovs(dpdk)|kvm|sfc|bgpvpn|moon|multisites)
+   * feature = (ovs(dpdk)|kvm|sfc|bgpvpn|multisites)
    * mode = (ha|noha)
 
 The constraints per test case are defined in the Functest configuration file

diff --git a/functest/ci/exec_test.sh b/functest/ci/exec_test.sh
index 6a2b55a..5d28650 100755 (executable)
--- a/functest/ci/exec_test.sh
+++ b/functest/ci/exec_test.sh
@@ -110,9 +110,6 @@ function run_test(){
             source ${FUNCTEST_CONF_DIR}/stackrc
             python ${FUNCTEST_TEST_DIR}/security_scan/security_scan.py --config ${FUNCTEST_TEST_DIR}/security_scan/config.ini
         ;;
-        "moon")
-            python ${REPOS_DIR}/moon/tests/run_tests.py $report
-        ;;
         *)
             echo "The test case '${test_name}' does not exist."
             exit 1

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 6397f76..7a3dc22 100755 (executable)
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -239,15 +239,6 @@ tiers:
 #                run:
 #                    module: 'functest.opnfv_tests.features.copper'
 #                    class: 'Copper'
-            -
-                name: moon
-                criteria: 'status == "PASS"'
-                blocking: false
-                description: >-
-                    Security management system for OPNFV
-                dependencies:
-                    installer: 'compass'
-                    scenario: '(odl)*(moon)'
             -
                 name: multisite
                 criteria: 'success_rate == 100%'