Move odl into healthcheck

It should be included in healthcheck as all basic tests.

Change-Id: I48439fe6385a9056eed8b779290f20633d59b0fd
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 433f873..81cb7f1 100644 (file)
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,4 +1,10 @@
 FROM opnfv/functest-core
 
+ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4
+
+RUN git clone https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \
+    (cd /src/odl_test && git checkout $ODL_TAG) && \
+    rm -r /src/odl_test/.git
+
 COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
 CMD ["run_tests", "-t", "all"]

diff --git a/docker/healthcheck/testcases.yaml b/docker/healthcheck/testcases.yaml
index 9e9b68b..dd26e76 100644 (file)
--- a/docker/healthcheck/testcases.yaml
+++ b/docker/healthcheck/testcases.yaml
@@ -170,6 +170,26 @@ tiers:
                     module: 'functest.opnfv_tests.openstack.cinder.cinder_test'
                     class: 'CinderCheck'
 
+            -
+                case_name: odl
+                project_name: functest
+                criteria: 100
+                blocking: true
+                description: >-
+                    Test Suite for the OpenDaylight SDN Controller. It
+                    integrates some test suites from upstream using
+                    Robot as the test framework.
+                dependencies:
+                    installer: ''
+                    scenario: 'odl'
+                run:
+                    module: 'functest.opnfv_tests.sdn.odl.odl'
+                    class: 'ODLTests'
+                    args:
+                        suites:
+                            - /src/odl_test/csit/suites/integration/basic
+                            - /src/odl_test/csit/suites/openstack/neutron
+
             -
                 case_name: api_check
                 project_name: functest

diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 4c9247c..076b1a9 100644 (file)
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -2,7 +2,6 @@ FROM opnfv/functest-tempest
 
 ARG BRANCH=master
 ARG OPENSTACK_TAG=stable/queens
-ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4
 ARG REFSTACK_TARGET=2017.09
 ARG PATROLE_TAG=0.3.0
 
@@ -24,10 +23,8 @@ RUN apk --no-cache add --virtual .build-deps --update \
     update-requirements -s --source /src/openstack-requirements /src/barbican-tempest-plugin/ && \
     pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \
         /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin -rthirdparty-requirements.txt && \
-    git clone https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \
-    (cd /src/odl_test && git checkout $ODL_TAG) && \
     virtualenv --system-site-packages /src/tempest/.venv && \
-    rm -r upper-constraints.txt upper-constraints.opnfv.txt thirdparty-requirements.txt /src/odl_test/.git \
+    rm -r upper-constraints.txt upper-constraints.opnfv.txt thirdparty-requirements.txt \
         /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin && \
     mkdir -p /home/opnfv/functest/data/refstack && \
     wget "https://refstack.openstack.org/api/v1/guidelines/${REFSTACK_TARGET}/tests?target=compute&type=required&alias=true&flag=false" \

diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index be26ab0..23bab43 100644 (file)
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -95,26 +95,6 @@ tiers:
                         'functest.opnfv_tests.openstack.shaker.shaker'
                     class: 'Shaker'
 
-            -
-                case_name: odl
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    Test Suite for the OpenDaylight SDN Controller. It
-                    integrates some test suites from upstream using
-                    Robot as the test framework.
-                dependencies:
-                    installer: ''
-                    scenario: 'odl'
-                run:
-                    module: 'functest.opnfv_tests.sdn.odl.odl'
-                    class: 'ODLTests'
-                    args:
-                        suites:
-                            - /src/odl_test/csit/suites/integration/basic
-                            - /src/odl_test/csit/suites/openstack/neutron
-
             -
                 case_name: snaps_smoke
                 project_name: functest

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 68d1a36..dbce552 100644 (file)
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -170,6 +170,26 @@ tiers:
                     module: 'functest.opnfv_tests.openstack.cinder.cinder_test'
                     class: 'CinderCheck'
 
+            -
+                case_name: odl
+                project_name: functest
+                criteria: 100
+                blocking: true
+                description: >-
+                    Test Suite for the OpenDaylight SDN Controller. It
+                    integrates some test suites from upstream using
+                    Robot as the test framework.
+                dependencies:
+                    installer: ''
+                    scenario: 'odl'
+                run:
+                    module: 'functest.opnfv_tests.sdn.odl.odl'
+                    class: 'ODLTests'
+                    args:
+                        suites:
+                            - /src/odl_test/csit/suites/integration/basic
+                            - /src/odl_test/csit/suites/openstack/neutron
+
             -
                 case_name: api_check
                 project_name: functest
@@ -300,26 +320,6 @@ tiers:
                         'functest.opnfv_tests.openstack.shaker.shaker'
                     class: 'Shaker'
 
-            -
-                case_name: odl
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    Test Suite for the OpenDaylight SDN Controller. It
-                    integrates some test suites from upstream using
-                    Robot as the test framework.
-                dependencies:
-                    installer: ''
-                    scenario: 'odl'
-                run:
-                    module: 'functest.opnfv_tests.sdn.odl.odl'
-                    class: 'ODLTests'
-                    args:
-                        suites:
-                            - /src/odl_test/csit/suites/integration/basic
-                            - /src/odl_test/csit/suites/openstack/neutron
-
             -
                 case_name: snaps_smoke
                 project_name: functest