diff options
Diffstat (limited to 'docker/features')
| -rw-r--r-- | docker/features/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/features/testcases.yaml | 20 | ||||
| -rw-r--r-- | docker/features/thirdparty-requirements.txt | 1 |
3 files changed, 2 insertions, 23 deletions
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index 8b0a2f60c..f20c58619 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -1,6 +1,6 @@ -FROM opnfv/functest-core +FROM opnfv/functest-core:euphrates -ARG BRANCH=master +ARG BRANCH=stable/euphrates ARG OPENSTACK_TAG=stable/ocata COPY thirdparty-requirements.txt thirdparty-requirements.txt diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml index 273a20e77..e8a2095c5 100644 --- a/docker/features/testcases.yaml +++ b/docker/features/testcases.yaml @@ -57,25 +57,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 +74,6 @@ tiers: - case_name: domino-multinode - enabled: false project_name: domino criteria: 100 blocking: false @@ -109,7 +90,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..0a9f2a101 100644 --- a/docker/features/thirdparty-requirements.txt +++ b/docker/features/thirdparty-requirements.txt @@ -1,6 +1,5 @@ baro_tests sdnvpn -securityscanning sfc promise domino |