diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2017-11-06 13:58:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-11-06 13:58:55 +0000 |
| commit | 806d9c521f9f1de9df3b9ad62002bb31e2b2a821 (patch) | |
| tree | 43f36948fd735c2084ae0f13b341fcd839d8e7b7 /docker/features | |
| parent | e491334942083a81dab0f3450a809e29b0687c31 (diff) | |
| parent | 57970bac489b114ab0483580fef683ea99fe62f1 (diff) | |
Merge "Update Functest to OpenStack stable/pike"
Diffstat (limited to 'docker/features')
| -rw-r--r-- | docker/features/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/features/testcases.yaml | 6 | ||||
| -rw-r--r-- | docker/features/thirdparty-requirements.txt | 12 |
3 files changed, 15 insertions, 9 deletions
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index ce2210edb..0d53655a5 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -1,7 +1,7 @@ FROM opnfv/functest-core ARG BRANCH=master -ARG OPENSTACK_TAG=stable/ocata +ARG OPENSTACK_TAG=stable/pike COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass && \ @@ -10,7 +10,6 @@ RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass && \ openssl-dev libjpeg-turbo-dev && \ wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \ sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ | \ - sed s/^requests===.*$/requests===2.13.0/ \ > upper-constraints.txt && \ pip install --no-cache-dir --src /src -cupper-constraints.txt \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ @@ -19,7 +18,8 @@ RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass && \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ doctor-tests && \ npm -g install npm@latest && \ - (cd /src/promise/source && npm install) && \ + # the next line must be uncommented as soon as promise is synced with pike + # (cd /src/promise/source && npm install) && \ rm -r upper-constraints.txt thirdparty-requirements.txt && \ apk del .build-deps COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml index b9e6ebbb9..5c72a2960 100644 --- a/docker/features/testcases.yaml +++ b/docker/features/testcases.yaml @@ -10,6 +10,7 @@ tiers: - case_name: promise project_name: promise + enabled: false criteria: 100 blocking: false description: >- @@ -26,6 +27,7 @@ tiers: - case_name: doctor-notification project_name: doctor + enabled: false criteria: 100 blocking: false description: >- @@ -42,6 +44,7 @@ tiers: - case_name: bgpvpn project_name: sdnvpn + enabled: false criteria: 100 blocking: false description: >- @@ -56,6 +59,7 @@ tiers: - case_name: functest-odl-sfc project_name: sfc + enabled: false criteria: 100 blocking: false description: >- @@ -72,6 +76,7 @@ tiers: - case_name: domino-multinode project_name: domino + enabled: false criteria: 100 blocking: false description: >- @@ -88,6 +93,7 @@ tiers: - case_name: barometercollectd project_name: barometer + enabled: false criteria: 100 blocking: false description: >- diff --git a/docker/features/thirdparty-requirements.txt b/docker/features/thirdparty-requirements.txt index 618f750be..62b2e9d62 100644 --- a/docker/features/thirdparty-requirements.txt +++ b/docker/features/thirdparty-requirements.txt @@ -1,6 +1,6 @@ -baro_tests -sdnvpn -sfc -promise -doctor-tests;python_version>='3.0' -domino +# baro_tests +# sdnvpn +# sfc +# promise +# doctor-tests;python_version>='3.0' +# domino |