diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-07-06 13:19:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-07-06 13:19:06 +0000 |
| commit | c92a48a163a7161874cfb01edcf79e6a721985ba (patch) | |
| tree | ae3c04d9cc31398bbd39e4ce566ea9fb5ffc26c3 | |
| parent | 931f49c6400a47fb7e187b1027d759cac4b1cc05 (diff) | |
| parent | 192dca7db121c8e56afd8f4a02786916c4d00947 (diff) | |
Merge "Add Moon in Functest"
| -rwxr-xr-x | ci/exec_test.sh | 4 | ||||
| -rw-r--r-- | ci/testcases.yaml | 8 | ||||
| -rw-r--r-- | docker/Dockerfile | 1 |
3 files changed, 13 insertions, 0 deletions
diff --git a/ci/exec_test.sh b/ci/exec_test.sh index 519ade4b..362cd9ec 100755 --- 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 491ddad9..25aba04e 100644 --- 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 611f75bf..04be6f80 100644 --- 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 |