diff options
author | Linda Wang <wangwulin@huawei.com> | 2017-10-26 01:37:37 +0000 |
---|---|---|
committer | Linda Wang <wangwulin@huawei.com> | 2017-11-06 14:12:45 +0000 |
commit | fb3ffed7e8128416094e80ecf126c9ca51933c69 (patch) | |
tree | 6191a84b1ba02ae106872fc98cff97ffc9f98e3e /docker/smoke | |
parent | 5fe48568e50ad9a556cc4094ee05e76d9255a05d (diff) |
Move fds to features tier
Change-Id: I7aa9d73c7ffbfdad7d5a929968fb640d9a8de62e
Signed-off-by: Linda Wang <wangwulin@huawei.com>
Diffstat (limited to 'docker/smoke')
-rw-r--r-- | docker/smoke/Dockerfile | 4 | ||||
-rw-r--r-- | docker/smoke/testcases.yaml | 19 |
2 files changed, 1 insertions, 22 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index ae56a6c75..6ece363a6 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 f8866e8a9..499713aae 100644 --- a/docker/smoke/testcases.yaml +++ b/docker/smoke/testcases.yaml @@ -127,25 +127,6 @@ tiers: - /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 criteria: 100 |