diff options
Diffstat (limited to 'docker/features')
| -rw-r--r-- | docker/features/Dockerfile | 10 | ||||
| -rw-r--r-- | docker/features/testcases.yaml | 25 | ||||
| -rw-r--r-- | docker/features/thirdparty-requirements.txt | 2 |
3 files changed, 10 insertions, 27 deletions
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index c3b1b041d..1ab4142f2 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -4,14 +4,18 @@ ARG BRANCH=master ARG OPENSTACK_TAG=stable/ocata COPY thirdparty-requirements.txt thirdparty-requirements.txt -RUN apk --no-cache add --update nodejs nodejs-npm python3 && \ +RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass && \ apk --no-cache add --virtual .build-deps --update \ - python-dev build-base linux-headers libffi-dev \ - openssl-dev libjpeg-turbo-dev git && \ + python-dev python3-dev build-base linux-headers libffi-dev \ + openssl-dev libjpeg-turbo-dev && \ pip install --no-cache-dir --src /src \ -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ -rthirdparty-requirements.txt && \ + python3 -m pip install --no-cache-dir --src /src \ + -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ + doctor-tests && \ npm -g install npm@latest && \ (cd /src/promise/source && npm install) && \ rm -r thirdparty-requirements.txt && \ diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml index 273a20e77..dc137429b 100644 --- a/docker/features/testcases.yaml +++ b/docker/features/testcases.yaml @@ -25,20 +25,19 @@ tiers: - case_name: doctor-notification - enabled: false project_name: doctor criteria: 100 blocking: false description: >- Test suite from Doctor project. dependencies: - installer: '(apex)|(fuel)' + installer: 'apex' scenario: '^((?!fdio).)*$' run: module: 'functest.core.feature' class: 'BashFeature' args: - cmd: '(cd /src/doctor-test/tests && run.sh)' + cmd: 'doctor-test' - case_name: bgpvpn @@ -57,25 +56,7 @@ tiers: cmd: 'run_sdnvpn_tests.py' - - case_name: security_scan - enabled: false - project_name: securityscanning - criteria: 100 - blocking: false - description: >- - Simple Security Scan - dependencies: - installer: 'apex' - scenario: '^((?!fdio).)*$' - run: - module: 'functest.core.feature' - class: 'BashFeature' - args: - cmd: '. /home/opnfv/functest/conf/stackrc && security_scan --config /usr/etc/securityscanning/config.ini' - - - case_name: functest-odl-sfc - enabled: true project_name: sfc criteria: 100 blocking: false @@ -92,7 +73,6 @@ tiers: - case_name: domino-multinode - enabled: false project_name: domino criteria: 100 blocking: false @@ -109,7 +89,6 @@ tiers: - case_name: barometercollectd - enabled: true project_name: barometer criteria: 100 blocking: false diff --git a/docker/features/thirdparty-requirements.txt b/docker/features/thirdparty-requirements.txt index 4a0b6ff88..618f750be 100644 --- a/docker/features/thirdparty-requirements.txt +++ b/docker/features/thirdparty-requirements.txt @@ -1,6 +1,6 @@ baro_tests sdnvpn -securityscanning sfc promise +doctor-tests;python_version>='3.0' domino |