diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/components/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/features/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/features/testcases.yaml | 6 | ||||
| -rw-r--r-- | docker/features/thirdparty-requirements.txt | 8 | ||||
| -rw-r--r-- | docker/parser/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/vnf/Dockerfile | 2 |
8 files changed, 15 insertions, 11 deletions
diff --git a/docker/components/Dockerfile b/docker/components/Dockerfile index a4561f6af..71a81541e 100644 --- a/docker/components/Dockerfile +++ b/docker/components/Dockerfile @@ -1,7 +1,7 @@ FROM opnfv/functest-core ARG BRANCH=master -ARG OPENSTACK_TAG=stable/pike +ARG OPENSTACK_TAG=stable/queens ARG RALLY_TAG=stable/0.10 ARG OS_FAULTS_TAG=0.1.16 diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index a66993e2a..cb44105af 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.7 ARG BRANCH=master -ARG OPENSTACK_TAG=stable/pike +ARG OPENSTACK_TAG=stable/queens RUN apk --no-cache add --update \ python libffi libssl1.0 libjpeg-turbo py-pip bash \ diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index 1a409b051..c53099cce 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -1,7 +1,7 @@ FROM opnfv/functest-core ARG BRANCH=master -ARG OPENSTACK_TAG=stable/pike +ARG OPENSTACK_TAG=stable/queens ARG FDS_TAG=master ARG RALLY_TAG=stable/0.10 ARG OS_FAULTS_TAG=0.1.16 diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml index a0cf3f90b..fc9d81d0b 100644 --- a/docker/features/testcases.yaml +++ b/docker/features/testcases.yaml @@ -11,12 +11,13 @@ tiers: - case_name: doctor-notification project_name: doctor + enabled: false criteria: 100 blocking: false description: >- Test suite from Doctor project. dependencies: - installer: 'apex' + installer: '(apex)|(fuel)|(daisy)' scenario: '^((?!fdio|nofeature).)*$' run: module: 'xtesting.core.feature' @@ -27,6 +28,7 @@ tiers: - case_name: bgpvpn project_name: sdnvpn + enabled: false criteria: 100 blocking: false description: >- @@ -41,6 +43,7 @@ tiers: - case_name: functest-odl-sfc project_name: sfc + enabled: false criteria: 100 blocking: false description: >- @@ -56,6 +59,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 73c11b447..914d4eefc 100644 --- a/docker/features/thirdparty-requirements.txt +++ b/docker/features/thirdparty-requirements.txt @@ -1,7 +1,7 @@ robotframework-httplibrary robotframework-requests robotframework-sshlibrary;python_version=='2.7' -baro_tests -sdnvpn -sfc -doctor-tests;python_version>='3.0' +# baro_tests +# sdnvpn +# sfc +# doctor-tests;python_version>='3.0' diff --git a/docker/parser/Dockerfile b/docker/parser/Dockerfile index bbc0a0760..a86716626 100644 --- a/docker/parser/Dockerfile +++ b/docker/parser/Dockerfile @@ -1,7 +1,7 @@ FROM opnfv/functest-core ARG BRANCH=master -ARG OPENSTACK_TAG=stable/pike +ARG OPENSTACK_TAG=stable/queens ARG RALLY_TAG=stable/0.10 ARG OS_FAULTS_TAG=0.1.16 diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index e09ea1c2c..7eb9eb292 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,7 +1,7 @@ FROM opnfv/functest-core ARG BRANCH=master -ARG OPENSTACK_TAG=stable/pike +ARG OPENSTACK_TAG=stable/queens ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4 ARG RALLY_TAG=stable/0.10 ARG OS_FAULTS_TAG=0.1.16 diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index e65c0c484..afaec2320 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -1,7 +1,7 @@ FROM opnfv/functest-core ARG BRANCH=master -ARG OPENSTACK_TAG=stable/pike +ARG OPENSTACK_TAG=stable/queens ARG VIMS_TAG=stable ARG JUJU_TAG=tags/juju-2.2.5 |