Merge "Add copper and domino in functest-features"

6 files changed, 43 insertions, 9 deletions

diff --git a/docker/Dockerfile b/docker/Dockerfile
index a87ecc46f..89cf86a69 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -84,8 +84,8 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe
     rm thirdparty-requirements.txt upper-constraints.txt
 
 # OPNFV repositories
-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/domino ${REPOS_DIR}/domino
+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/promise ${REPOS_DIR}/promise
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/netready ${REPOS_DIR}/netready
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index 3c52b5da3..73f4d2cef 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -11,7 +11,9 @@ RUN apk --no-cache add --virtual .build-deps --update \
         -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
         -rthirdparty-requirements.txt && \
-    rm -r thirdparty-requirements.txt && \
+    git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/domino /src/domino && \
+    git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper /src/copper && \
+    rm -r thirdparty-requirements.txt /src/domino/.git /src/copper/.git && \
     apk del .build-deps
 COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml
 CMD ["bash","-c","prepare_env start && run_tests -t all"]
diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml
index 6bf01a33c..48b1468df 100644
--- a/docker/features/testcases.yaml
+++ b/docker/features/testcases.yaml
@@ -41,6 +41,23 @@ tiers:
                         cmd: '. /home/opnfv/functest/conf/stackrc && security_scan --config /usr/local/etc/securityscanning/config.ini'
 
             -
+                case_name: copper
+                enabled: false
+                project_name: copper
+                criteria: 100
+                blocking: false
+                description: >-
+                    Test suite for policy management based on OpenStack Congress
+                dependencies:
+                    installer: 'apex'
+                    scenario: '^((?!fdio).)*$'
+                run:
+                    module: 'functest.core.feature'
+                    class: 'BashFeature'
+                    args:
+                        cmd: 'cd /src/copper/tests && bash run.sh && cd -'
+
+            -
                 case_name: functest-odl-sfc
                 enabled: false
                 project_name: sfc
@@ -58,6 +75,23 @@ tiers:
                         cmd: 'run_sfc_tests.py'
 
             -
+                case_name: domino-multinode
+                enabled: false
+                project_name: domino
+                criteria: 100
+                blocking: false
+                description: >-
+                    Test suite from Domino project.
+                dependencies:
+                    installer: ''
+                    scenario: ''
+                run:
+                    module: 'functest.core.feature'
+                    class: 'BashFeature'
+                    args:
+                        cmd: 'cd /src/domino && ./tests/run_multinode.sh'
+
+            -
                 case_name: barometercollectd
                 enabled: false
                 project_name: barometer
diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 8da1d6172..31ce4b90e 100644
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -10,8 +10,6 @@ general:
         repo_netready:      /home/opnfv/repos/netready
         repo_barometer:     /home/opnfv/repos/barometer
         repo_doctor:        /home/opnfv/repos/doctor
-        repo_copper:        /home/opnfv/repos/copper
-        repo_domino:        /home/opnfv/repos/domino
         repo_odl_test:      /src/odl_test
         repo_fds:           /src/fds
         repo_securityscan:  /home/opnfv/repos/securityscanning
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 2fa7251c4..99c0cc202 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -331,7 +331,7 @@ tiers:
                     module: 'functest.core.feature'
                     class: 'BashFeature'
                     args:
-                        cmd: 'cd /home/opnfv/repos/copper/tests && bash run.sh && cd -'
+                        cmd: 'cd /src/copper/tests && bash run.sh && cd -'
 
             -
                 case_name: multisite
@@ -411,7 +411,7 @@ tiers:
                     module: 'functest.core.feature'
                     class: 'BashFeature'
                     args:
-                        cmd: 'cd /home/opnfv/repos/domino && ./tests/run_multinode.sh'
+                        cmd: 'cd /src/domino && ./tests/run_multinode.sh'
 
             -
                 case_name: gluon_vping
diff --git a/functest/tests/unit/core/test_feature.py b/functest/tests/unit/core/test_feature.py
index 988981eff..553a5dfa4 100644
--- a/functest/tests/unit/core/test_feature.py
+++ b/functest/tests/unit/core/test_feature.py
@@ -22,8 +22,8 @@ class FeatureTestingBase(unittest.TestCase):
 
     _case_name = "foo"
     _project_name = "bar"
-    _repo = "dir_repo_copper"
-    _cmd = "cd /home/opnfv/repos/foo/tests && bash run.sh && cd -"
+    _repo = "dir_repo_bar"
+    _cmd = "cd /home/opnfv/repos/bar/tests && bash run.sh && cd -"
     _output_file = '/home/opnfv/functest/results/foo.log'
     feature = None