Remove fds in all branches

FDS didn't participate to Gambia.
Removing it in all branches avoids compexifying the jjbs.

This patch will be reverted as soon as the support is ready.

Change-Id: I9fb293b2972e0deb318ac9d3d08377039ea247e4
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 2fd07adb36288e9247ad73a7344340c36754132e)

diff --git a/ansible/site.yml b/ansible/site.yml
index e0b4157..190d5de 100644 (file)
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -96,6 +96,5 @@
             - bgpvpn
             - functest-odl-sfc
             - barometercollectd
-            - fds
             - vgpu
             - stor4nfv_os

diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index 292ebe6..194d23c 100644 (file)
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -2,7 +2,6 @@ FROM opnfv/functest-tempest:hunter
 
 ARG BRANCH=stable/hunter
 ARG OPENSTACK_TAG=stable/rocky
-ARG FDS_TAG=master
 
 COPY thirdparty-requirements.txt thirdparty-requirements.txt
 RUN apk --no-cache add --update python3 sshpass && \
@@ -14,17 +13,13 @@ RUN apk --no-cache add --update python3 sshpass && \
         > upper-constraints.txt && \
     wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH | \
         sed -E /#egg=functest/d > upper-constraints.opnfv.txt && \
-    git init /src/fds && \
-    (cd /src/fds && \
-        git fetch --tags https://gerrit.opnfv.org/gerrit/fds $FDS_TAG && \
-        git checkout FETCH_HEAD) && \
     pip install --no-cache-dir --src /src -cupper-constraints.txt \
         -cupper-constraints.opnfv.txt \
         -rthirdparty-requirements.txt && \
     python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt \
         -cupper-constraints.opnfv.txt \
         -rthirdparty-requirements.txt && \
-    rm -r upper-constraints.txt upper-constraints.opnfv.txt thirdparty-requirements.txt /src/fds/.git && \
+    rm -r upper-constraints.txt upper-constraints.opnfv.txt thirdparty-requirements.txt && \
     apk del .build-deps
 COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
 CMD ["run_tests", "-t", "all"]

diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml
index 00f507a..f096892 100644 (file)
--- a/docker/features/testcases.yaml
+++ b/docker/features/testcases.yaml
@@ -63,23 +63,6 @@ tiers:
                 run:
                     name: barometercollectd
 
-            -
-                case_name: fds
-                project_name: fastdatastacks
-                enabled: false
-                criteria: 100
-                blocking: false
-                description: >-
-                    Test Suite for the OpenDaylight SDN Controller when GBP
-                    features are installed. It integrates some test suites from
-                    upstream using Robot as the test framework.
-                dependencies:
-                    - DEPLOY_SCENARIO: 'odl.*-fdio'
-                run:
-                    name: odl
-                    args:
-                        suites:
-                            - /src/fds/testing/robot
             -
                 case_name: vgpu
                 project_name: functest

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 7fe0d69..c70315c 100644 (file)
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -449,23 +449,6 @@ tiers:
                 run:
                     name: barometercollectd
 
-            -
-                case_name: fds
-                project_name: fastdatastacks
-                enabled: false
-                criteria: 100
-                blocking: false
-                description: >-
-                    Test Suite for the OpenDaylight SDN Controller when GBP
-                    features are installed. It integrates some test suites from
-                    upstream using Robot as the test framework.
-                dependencies:
-                    - DEPLOY_SCENARIO: 'odl.*-fdio'
-                run:
-                    name: odl
-                    args:
-                        suites:
-                            - /src/fds/testing/robot
             -
                 case_name: vgpu
                 project_name: functest