summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2017-08-16 17:44:28 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-16 17:44:28 +0000
commit469abc969a94e3e3c6f4967b6d1fd8953a56e497 (patch)
tree8fc3e28f503785ec729e741c060f22fa856bbb85
parentd49350df590caaa3db45c9a201618248d3f92b92 (diff)
parentfc32da5da89e3f8249e5dc3e1d4ae5e425805912 (diff)
Merge "Remove copper refs"
-rw-r--r--docker/Dockerfile1
-rw-r--r--docker/features/Dockerfile3
-rw-r--r--docker/features/testcases.yaml17
-rw-r--r--docs/release/release-notes/functest-release.rst4
-rw-r--r--docs/testing/developer/devguide/index.rst2
-rw-r--r--docs/testing/user/configguide/configguide.rst1
-rw-r--r--docs/testing/user/userguide/index.rst2
-rw-r--r--docs/testing/user/userguide/introduction.rst1
-rw-r--r--functest/ci/testcases.yaml17
9 files changed, 3 insertions, 45 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
diff --git a/docs/release/release-notes/functest-release.rst b/docs/release/release-notes/functest-release.rst
index 05fe89fc9..02d99c96d 100644
--- a/docs/release/release-notes/functest-release.rst
+++ b/docs/release/release-notes/functest-release.rst
@@ -256,8 +256,8 @@ test [0-3]. The scoring method is described in https://wiki.opnfv.org/pages/view
e.g.
apex/odl_l2-nofeature-ha
- tests = vping_ssh+vping_userdata+tempest+rally+odl+doctor+copper
- Scoring = 21/21 = 7 * 3
+ tests = vping_ssh+vping_userdata+tempest+rally+odl+doctor
+ Scoring = 18/18 = 6 * 3
By default, if not specified, the scenarios are HA.
HA means OpenStack High Availability (main services). Note that not
diff --git a/docs/testing/developer/devguide/index.rst b/docs/testing/developer/devguide/index.rst
index 615e4513b..1e794aa03 100644
--- a/docs/testing/developer/devguide/index.rst
+++ b/docs/testing/developer/devguide/index.rst
@@ -359,8 +359,6 @@ Please note that currently token authorization is implemented but is not yet ena
+---------------------+---------+---------+---------+---------+
| parser | | | X | |
+---------------------+---------+---------+---------+---------+
- | copper | X | | | X |
- +---------------------+---------+---------+---------+---------+
src: colorado (see release note for the last matrix version)
All the testcases listed in the table are runnable on
diff --git a/docs/testing/user/configguide/configguide.rst b/docs/testing/user/configguide/configguide.rst
index 35548c9b2..a72055ca9 100644
--- a/docs/testing/user/configguide/configguide.rst
+++ b/docs/testing/user/configguide/configguide.rst
@@ -301,7 +301,6 @@ should now be in place::
| `-- results
`-- repos
|-- bgpvpn
- |-- copper
|-- doctor
|-- domino
|-- functest
diff --git a/docs/testing/user/userguide/index.rst b/docs/testing/user/userguide/index.rst
index c7aa2893c..62e0c076c 100644
--- a/docs/testing/user/userguide/index.rst
+++ b/docs/testing/user/userguide/index.rst
@@ -484,8 +484,6 @@ In Danube, Functest supports the integration of:
* promise
* security_scan
-Note: copper is not supported in Danube.
-
Please refer to the dedicated feature user guides for details.
diff --git a/docs/testing/user/userguide/introduction.rst b/docs/testing/user/userguide/introduction.rst
index 6390bc154..2954aaa83 100644
--- a/docs/testing/user/userguide/introduction.rst
+++ b/docs/testing/user/userguide/introduction.rst
@@ -249,7 +249,6 @@ section `Executing the functest suites`_ of this document.
.. _`[2]`: http://docs.openstack.org/developer/tempest/overview.html
.. _`[3]`: https://rally.readthedocs.org/en/latest/index.html
-.. _`Copper User Guide`: http://artifacts.opnfv.org/copper/colorado/docs/userguide/index.html
.. _`Doctor User Guide`: http://artifacts.opnfv.org/doctor/colorado/userguide/index.html
.. _`Promise User Guide`: http://artifacts.opnfv.org/promise/colorado/docs/userguide/index.html
.. _`ONOSFW User Guide`: http://artifacts.opnfv.org/onosfw/colorado/userguide/index.html
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 4f378a019..d53202d5c 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -317,23 +317,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: multisite
enabled: false
project_name: multisite