diff options
Diffstat (limited to 'docker/features')
| -rw-r--r-- | docker/features/Dockerfile | 8 | ||||
| -rw-r--r-- | docker/features/testcases.yaml | 3 | ||||
| -rw-r--r-- | docker/features/thirdparty-requirements.txt | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index 1a409b051..68469382b 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -1,10 +1,10 @@ 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 +ARG RALLY_TAG=0.11.2 +ARG OS_FAULTS_TAG=0.1.17 COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --update python3 sshpass && \ @@ -26,7 +26,7 @@ RUN apk --no-cache add --update python3 sshpass && \ update-requirements -s --source /src/openstack-requirements /src/rally/ && \ pip install --no-cache-dir --src /src -cupper-constraints.txt \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ - tempest /src/os-faults && \ + tempest rally-openstack /src/os-faults && \ pip install --no-cache-dir --src /src -cupper-constraints.txt \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ /src/rally -rthirdparty-requirements.txt && \ diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml index a0cf3f90b..5da40c17a 100644 --- a/docker/features/testcases.yaml +++ b/docker/features/testcases.yaml @@ -16,7 +16,7 @@ tiers: description: >- Test suite from Doctor project. dependencies: - installer: 'apex' + installer: '(apex)|(fuel)|(daisy)' scenario: '^((?!fdio|nofeature).)*$' run: module: 'xtesting.core.feature' @@ -27,6 +27,7 @@ tiers: - case_name: bgpvpn project_name: sdnvpn + enabled: false criteria: 100 blocking: false description: >- diff --git a/docker/features/thirdparty-requirements.txt b/docker/features/thirdparty-requirements.txt index 73c11b447..910b514b5 100644 --- a/docker/features/thirdparty-requirements.txt +++ b/docker/features/thirdparty-requirements.txt @@ -2,6 +2,6 @@ robotframework-httplibrary robotframework-requests robotframework-sshlibrary;python_version=='2.7' baro_tests -sdnvpn +# sdnvpn sfc doctor-tests;python_version>='3.0' |