Merge "Add functest-features based on Alpine"

6 files changed, 107 insertions, 3 deletions

diff --git a/build.sh b/build.sh
index dbc79e0d3..c7efc6384 100644
--- a/build.sh
+++ b/build.sh
@@ -7,7 +7,7 @@ repo=${repo:-opnfv}
 (cd docker && docker build -t "${repo}/functest" .)
 docker push "${repo}/functest"
 
-for dir in docker/core docker/healthcheck docker/smoke; do
+for dir in docker/core docker/healthcheck docker/smoke docker/features; do
     (cd ${dir} && docker build -t "${repo}/functest-${dir##**/}" .)
     docker push "${repo}/functest-${dir##**/}"
 done
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
new file mode 100644
index 000000000..3c52b5da3
--- /dev/null
+++ b/docker/features/Dockerfile
@@ -0,0 +1,17 @@
+FROM opnfv/functest-core
+
+ARG BRANCH=master
+ARG OPENSTACK_TAG=stable/ocata
+
+COPY thirdparty-requirements.txt thirdparty-requirements.txt
+RUN apk --no-cache add --virtual .build-deps --update \
+        python-dev build-base linux-headers libffi-dev \
+        openssl-dev libjpeg-turbo-dev git && \
+    pip install --no-cache-dir --src /src \
+        -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 && \
+    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/hooks/build b/docker/features/hooks/build
new file mode 100644
index 000000000..e5d15b526
--- /dev/null
+++ b/docker/features/hooks/build
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+from="${DOCKER_REPO%/*}/functest-core"
+sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile &&
+    docker build -t "${IMAGE_NAME}" .
+
+exit $?
diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml
new file mode 100644
index 000000000..6bf01a33c
--- /dev/null
+++ b/docker/features/testcases.yaml
@@ -0,0 +1,76 @@
+tiers:
+    -
+        name: features
+        order: 2
+        ci_loop: '(daily)|(weekly)'
+        description : >-
+            Test suites from feature projects
+            integrated in functest
+        testcases:
+            -
+                case_name: bgpvpn
+                project_name: sdnvpn
+                criteria: 100
+                blocking: false
+                description: >-
+                    Test suite from SDNVPN project.
+                dependencies:
+                    installer: '(fuel)|(apex)|(netvirt)'
+                    scenario: 'bgpvpn'
+                run:
+                    module: 'functest.core.feature'
+                    class: 'BashFeature'
+                    args:
+                        cmd: 'run_sdnvpn_tests.py'
+
+            -
+                case_name: security_scan
+                enabled: false
+                project_name: securityscanning
+                criteria: 100
+                blocking: false
+                description: >-
+                    Simple Security Scan
+                dependencies:
+                    installer: 'apex'
+                    scenario: '^((?!fdio).)*$'
+                run:
+                    module: 'functest.core.feature'
+                    class: 'BashFeature'
+                    args:
+                        cmd: '. /home/opnfv/functest/conf/stackrc && security_scan --config /usr/local/etc/securityscanning/config.ini'
+
+            -
+                case_name: functest-odl-sfc
+                enabled: false
+                project_name: sfc
+                criteria: 100
+                blocking: false
+                description: >-
+                    Test suite for odl-sfc to test two chains and two SFs
+                dependencies:
+                    installer: '(apex)|(fuel)'
+                    scenario: 'odl_l2-sfc'
+                run:
+                    module: 'functest.core.feature'
+                    class: 'BashFeature'
+                    args:
+                        cmd: 'run_sfc_tests.py'
+
+            -
+                case_name: barometercollectd
+                enabled: false
+                project_name: barometer
+                criteria: 100
+                blocking: false
+                description: >-
+                    Test suite for the Barometer project. Separate tests verify the
+                    proper configuration and functionality of the following
+                    collectd plugins Ceilometer, Hugepages, Memory RAS (mcelog),
+                    and OVS Events
+                dependencies:
+                    installer: 'fuel'
+                    scenario: 'kvm_ovs_dpdk_bar'
+                run:
+                     module: 'baro_tests.barometer'
+                     class: 'BarometerCollectd'
diff --git a/docker/features/thirdparty-requirements.txt b/docker/features/thirdparty-requirements.txt
new file mode 100644
index 000000000..ee2e5e9ca
--- /dev/null
+++ b/docker/features/thirdparty-requirements.txt
@@ -0,0 +1,4 @@
+baro_tests
+sdnvpn
+securityscanning
+sfc
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 3dcf9b13e..2fa7251c4 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -297,7 +297,7 @@ tiers:
                     module: 'functest.core.feature'
                     class: 'BashFeature'
                     args:
-                        cmd: 'cd /usr/local/lib/python2.7/dist-packages/sdnvpn/test/functest && python ./run_tests.py'
+                        cmd: 'run_sdnvpn_tests.py'
 
             -
                 case_name: security_scan
@@ -363,7 +363,7 @@ tiers:
                     module: 'functest.core.feature'
                     class: 'BashFeature'
                     args:
-                        cmd: 'cd /usr/local/lib/python2.7/dist-packages/sfc/tests/functest && python ./run_tests.py'
+                        cmd: 'run_sfc_tests.py'
 
             -
                 case_name: onos_sfc