diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/components/Dockerfile | 8 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/features/Dockerfile | 8 | ||||
| -rw-r--r-- | docker/features/testcases.yaml | 3 | ||||
| -rw-r--r-- | docker/features/thirdparty-requirements.txt | 2 | ||||
| -rw-r--r-- | docker/parser/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 10 | ||||
| -rw-r--r-- | docker/vnf/Dockerfile | 2 |
8 files changed, 19 insertions, 20 deletions
diff --git a/docker/components/Dockerfile b/docker/components/Dockerfile index a4561f6af..356c5d594 100644 --- a/docker/components/Dockerfile +++ b/docker/components/Dockerfile @@ -1,9 +1,9 @@ FROM opnfv/functest-core ARG BRANCH=master -ARG OPENSTACK_TAG=stable/pike -ARG RALLY_TAG=stable/0.10 -ARG OS_FAULTS_TAG=0.1.16 +ARG OPENSTACK_TAG=stable/queens +ARG RALLY_TAG=0.11.2 +ARG OS_FAULTS_TAG=0.1.17 RUN apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ @@ -20,7 +20,7 @@ RUN apk --no-cache add --virtual .build-deps --update \ 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 && \ 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..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' diff --git a/docker/parser/Dockerfile b/docker/parser/Dockerfile index bbc0a0760..fe21bb54c 100644 --- a/docker/parser/Dockerfile +++ b/docker/parser/Dockerfile @@ -1,9 +1,7 @@ FROM opnfv/functest-core ARG BRANCH=master -ARG OPENSTACK_TAG=stable/pike -ARG RALLY_TAG=stable/0.10 -ARG OS_FAULTS_TAG=0.1.16 +ARG OPENSTACK_TAG=stable/queens COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --virtual .build-deps --update \ diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index e09ea1c2c..9b99282c7 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,12 +1,12 @@ 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 +ARG RALLY_TAG=0.11.2 +ARG OS_FAULTS_TAG=0.1.17 ARG REFSTACK_TARGET=2017.09 -ARG PATROLE_TAG=0.2.0 +ARG PATROLE_TAG=0.3.0 COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --virtual .build-deps --update \ @@ -27,7 +27,7 @@ RUN apk --no-cache add --virtual .build-deps --update \ update-requirements -s --source /src/openstack-requirements /src/patrole/ && \ 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 /src/patrole -rthirdparty-requirements.txt && \ 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 |