diff options
| -rw-r--r-- | docker/features/Dockerfile | 7 | ||||
| -rw-r--r-- | docker/features/testcases.yaml | 16 | ||||
| -rw-r--r-- | functest/ci/testcases.yaml | 16 |
3 files changed, 1 insertions, 38 deletions
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index 616cb2445..bb0ef2881 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -2,7 +2,6 @@ FROM opnfv/functest-tempest:gambia ARG BRANCH=stable/gambia ARG OPENSTACK_TAG=stable/queens -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 a2f71f8c1..f3c286ec0 100644 --- a/docker/features/testcases.yaml +++ b/docker/features/testcases.yaml @@ -62,22 +62,6 @@ tiers: name: barometercollectd - - 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: - - DEPLOY_SCENARIO: 'odl.*-fdio' - run: - name: odl - args: - suites: - - /src/fds/testing/robot - - case_name: vgpu project_name: functest criteria: 100 diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index 8f113ba93..a06f4b97a 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -449,22 +449,6 @@ tiers: name: barometercollectd - - 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: - - DEPLOY_SCENARIO: 'odl.*-fdio' - run: - name: odl - args: - suites: - - /src/fds/testing/robot - - case_name: vgpu project_name: functest criteria: 100 |