diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/components/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/features/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/features/testcases.yaml | 20 | ||||
| -rw-r--r-- | docker/features/thirdparty-requirements.txt | 1 | ||||
| -rw-r--r-- | docker/healthcheck/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/parser/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/parser/testcases.yaml | 3 | ||||
| -rw-r--r-- | docker/restapi/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/restapi/thirdparty-requirements.txt | 1 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/thirdparty-requirements.txt | 1 | ||||
| -rw-r--r-- | docker/vnf/Dockerfile | 2 |
14 files changed, 15 insertions, 39 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 218d74417..5d934dfe9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -12,7 +12,7 @@ MAINTAINER Jose Lausuch <jose.lausuch@ericsson.com> LABEL version="0.1" description="OPNFV Functest Docker container" # Environment variables -ARG BRANCH=master +ARG BRANCH=stable/euphrates ARG RALLY_TAG=stable/0.9 ARG ODL_TAG=35e415b6873b39d72775c88a337e92dac26012e2 ARG OPENSTACK_TAG=stable/ocata diff --git a/docker/components/Dockerfile b/docker/components/Dockerfile index 8923e4cd7..8794f78de 100644 --- a/docker/components/Dockerfile +++ b/docker/components/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-core +FROM opnfv/functest-core:euphrates 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/core/Dockerfile b/docker/core/Dockerfile index 04e32598e..75180f99b 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.6 -ARG BRANCH=master +ARG BRANCH=stable/euphrates ARG OPENSTACK_TAG=stable/ocata ARG RALLY_TAG=stable/0.9 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 diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index 8923e4cd7..8794f78de 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-core +FROM opnfv/functest-core:euphrates 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/parser/Dockerfile b/docker/parser/Dockerfile index a28a1f5b0..43bd0adc1 100644 --- a/docker/parser/Dockerfile +++ b/docker/parser/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.6 -ARG BRANCH=master +ARG BRANCH=stable/euphrates ARG OPENSTACK_TAG=stable/pike ARG RALLY_TAG=stable/0.9 diff --git a/docker/parser/testcases.yaml b/docker/parser/testcases.yaml index 4ab3fae2b..45ccb0beb 100644 --- a/docker/parser/testcases.yaml +++ b/docker/parser/testcases.yaml @@ -9,14 +9,13 @@ tiers: testcases: - case_name: parser-basics - enabled: false project_name: parser criteria: 100 blocking: false description: >- Test suite from Parser project. dependencies: - installer: 'fuel' + installer: '' scenario: '^((?!bgpvpn|noha).)*$' run: module: 'functest.core.feature' diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile index 2c7560286..23adcc852 100644 --- a/docker/restapi/Dockerfile +++ b/docker/restapi/Dockerfile @@ -1,9 +1,9 @@ -FROM opnfv/functest-core +FROM opnfv/functest-core:euphrates -ARG BRANCH=master +ARG BRANCH=stable/euphrates ARG OPENSTACK_TAG=stable/ocata ARG ODL_TAG=35e415b6873b39d72775c88a337e92dac26012e2 -ARG FDS_TAG=master +ARG FDS_TAG=stable/euphrates ARG REFSTACK_TAG=4e187b07672dd1c41cb7c94658f1c91edebf53a2 ARG VIMS_TAG=stable diff --git a/docker/restapi/thirdparty-requirements.txt b/docker/restapi/thirdparty-requirements.txt index 4a0b6ff88..0a9f2a101 100644 --- a/docker/restapi/thirdparty-requirements.txt +++ b/docker/restapi/thirdparty-requirements.txt @@ -1,6 +1,5 @@ baro_tests sdnvpn -securityscanning sfc promise domino diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index fe2f91917..82043840a 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,9 +1,9 @@ -FROM opnfv/functest-core +FROM opnfv/functest-core:euphrates -ARG BRANCH=master +ARG BRANCH=stable/euphrates ARG OPENSTACK_TAG=stable/ocata ARG ODL_TAG=35e415b6873b39d72775c88a337e92dac26012e2 -ARG FDS_TAG=master +ARG FDS_TAG=stable/euphrates ARG REFSTACK_TAG=4e187b07672dd1c41cb7c94658f1c91edebf53a2 RUN apk --no-cache add --virtual .build-deps --update \ diff --git a/docker/thirdparty-requirements.txt b/docker/thirdparty-requirements.txt index cc8f5f9c8..741eb8ef6 100644 --- a/docker/thirdparty-requirements.txt +++ b/docker/thirdparty-requirements.txt @@ -1,6 +1,5 @@ baro_tests sdnvpn -securityscanning sfc promise doctor-test diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index 36e80d7e2..520385585 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-core +FROM opnfv/functest-core:euphrates ARG VIMS_TAG=stable |