From fb3ffed7e8128416094e80ecf126c9ca51933c69 Mon Sep 17 00:00:00 2001
From: Linda Wang <wangwulin@huawei.com>
Date: Thu, 26 Oct 2017 01:37:37 +0000
Subject: Move fds to features tier

Change-Id: I7aa9d73c7ffbfdad7d5a929968fb640d9a8de62e
Signed-off-by: Linda Wang <wangwulin@huawei.com>
---
 docker/smoke/Dockerfile     |  4 +---
 docker/smoke/testcases.yaml | 19 -------------------
 2 files changed, 1 insertion(+), 22 deletions(-)

(limited to 'docker/smoke')

diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index ae56a6c7..6ece363a 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -3,7 +3,6 @@ FROM opnfv/functest-core
 ARG BRANCH=master
 ARG OPENSTACK_TAG=stable/pike
 ARG ODL_TAG=master
-ARG FDS_TAG=master
 ARG REFSTACK_TAG=master
 
 RUN apk --no-cache add --virtual .build-deps --update \
@@ -20,10 +19,9 @@ RUN apk --no-cache add --virtual .build-deps --update \
         -e/src/refstack-client && \
     git clone https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \
     (cd src/odl_test && git checkout $ODL_TAG) && \
-    git clone --depth 1 -b $FDS_TAG https://gerrit.opnfv.org/gerrit/fds /src/fds && \
     ln -s /src/tempest /src/refstack-client/.tempest && \
     virtualenv --system-site-packages /src/tempest/.venv && \
-    rm -r upper-constraints.txt /src/refstack-client/.git /src/odl_test/.git /src/fds/.git && \
+    rm -r upper-constraints.txt /src/refstack-client/.git /src/odl_test/.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/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index f8866e8a..499713aa 100644
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -126,25 +126,6 @@ tiers:
                             -  /src/odl_test/csit/suites/openstack/neutron
                             -  /src/odl_test/csit/suites/openstack/connectivity
 
-            -
-                case_name: fds
-                project_name: fastdatastacks
-                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:
-                    installer: 'apex'
-                    scenario: 'odl.*-fdio'
-                run:
-                    module: 'functest.opnfv_tests.sdn.odl.odl'
-                    class: 'ODLTests'
-                    args:
-                        suites:
-                            -  /src/fds/testing/robot
-
             -
                 case_name: snaps_smoke
                 project_name: functest
-- 
cgit 1.2.3-korg