diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2017-08-16 17:44:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-16 17:44:28 +0000 |
| commit | 469abc969a94e3e3c6f4967b6d1fd8953a56e497 (patch) | |
| tree | 8fc3e28f503785ec729e741c060f22fa856bbb85 /docker | |
| parent | d49350df590caaa3db45c9a201618248d3f92b92 (diff) | |
| parent | fc32da5da89e3f8249e5dc3e1d4ae5e425805912 (diff) | |
Merge "Remove copper refs"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 1 | ||||
| -rw-r--r-- | docker/features/Dockerfile | 3 | ||||
| -rw-r--r-- | docker/features/testcases.yaml | 17 |
3 files changed, 1 insertions, 20 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 6f53e8d33..1811e9389 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -84,7 +84,6 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe rm thirdparty-requirements.txt upper-constraints.txt # OPNFV repositories -RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper /src/copper RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/domino /src/domino RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/doctor ${REPOS_DIR}/doctor RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/fds /src/fds diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index 73f4d2cef..6cd88b2bc 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -12,8 +12,7 @@ RUN apk --no-cache add --virtual .build-deps --update \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ -rthirdparty-requirements.txt && \ git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/domino /src/domino && \ - git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper /src/copper && \ - rm -r thirdparty-requirements.txt /src/domino/.git /src/copper/.git && \ + rm -r thirdparty-requirements.txt /src/domino/.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/features/testcases.yaml b/docker/features/testcases.yaml index 48b1468df..3587b59c8 100644 --- a/docker/features/testcases.yaml +++ b/docker/features/testcases.yaml @@ -41,23 +41,6 @@ tiers: cmd: '. /home/opnfv/functest/conf/stackrc && security_scan --config /usr/local/etc/securityscanning/config.ini' - - case_name: copper - enabled: false - project_name: copper - criteria: 100 - blocking: false - description: >- - Test suite for policy management based on OpenStack Congress - dependencies: - installer: 'apex' - scenario: '^((?!fdio).)*$' - run: - module: 'functest.core.feature' - class: 'BashFeature' - args: - cmd: 'cd /src/copper/tests && bash run.sh && cd -' - - - case_name: functest-odl-sfc enabled: false project_name: sfc |