Add Moon in Functest

JIRA: FUNCTEST-210

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

diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index 519ade4..362cd9e 100755 (executable)
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -137,6 +137,10 @@ function run_test(){
         "copper")
             python ${FUNCTEST_REPO_DIR}/testcases/features/copper.py
         ;;
+        "moon")
+            # TODO put the link to Moon script to be run (if test runnable) here
+            ${repos_dir}/moon/tests/run_tests.sh
+        ;;
         *)
             echo "The test case '${test_name}' does not exist."
             exit 1

diff --git a/ci/testcases.yaml b/ci/testcases.yaml
index 491ddad..25aba04 100644 (file)
--- a/ci/testcases.yaml
+++ b/ci/testcases.yaml
@@ -150,6 +150,14 @@ tiers:
                 dependencies:
                     installer: 'apex'
                     scenario: ''
+            -
+                name: moon
+                criteria: 'status == "PASS"'
+                description: >-
+                    Security management system for OPNFV
+                dependencies:
+                    installer: 'compass'
+                    scenario: '(odl)*(moon)'
 
     -
         name: openstack

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 30d2a7a..ab22774 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -79,6 +79,7 @@ RUN git clone https://github.com/wuwenbin2/OnosSystemTest.git ${repos_dir}/onos
 RUN git clone https://github.com/opnfv/promise ${repos_dir}/promise
 RUN git clone https://gerrit.opnfv.org/gerrit/ovno ${repos_dir}/ovno
 RUN git clone https://gerrit.opnfv.org/gerrit/copper ${repos_dir}/copper
+RUN git clone https://gerrit.opnfv.org/gerrit/moon ${repos_dir}/moon
 
 RUN pip install -r ${repos_dir}/functest/docker/requirements.pip
 RUN pip install -r ${repos_dir}/rally/requirements.txt