diff options
| author |   valentin boucher <valentin.boucher@kontron.com> | 2018-04-13 12:44:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-04-13 12:44:12 +0000 |
| commit | 36acb258118f65eb99e99feaaa9a2c5796cfa1a3 (patch) | |
| tree | 213a1740bb524a6c122a309f3f1e8cd97ea02055 /docker | |
| parent | 1e1b6e46a650c09602c3787391294789e9cc2ebc (diff) | |
| parent | 6c5994705d65d15ef9b4c5b20566b896e710bae3 (diff) | |
Merge "Switch to stestr"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/components/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/features/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/parser/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 6 |
4 files changed, 9 insertions, 11 deletions
diff --git a/docker/components/Dockerfile b/docker/components/Dockerfile index 71a81541e..356c5d594 100644 --- a/docker/components/Dockerfile +++ b/docker/components/Dockerfile @@ -2,8 +2,8 @@ FROM opnfv/functest-core ARG BRANCH=master ARG OPENSTACK_TAG=stable/queens -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 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/features/Dockerfile b/docker/features/Dockerfile index c53099cce..68469382b 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -3,8 +3,8 @@ FROM opnfv/functest-core ARG BRANCH=master 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/parser/Dockerfile b/docker/parser/Dockerfile index a86716626..fe21bb54c 100644 --- a/docker/parser/Dockerfile +++ b/docker/parser/Dockerfile @@ -2,8 +2,6 @@ FROM opnfv/functest-core ARG BRANCH=master ARG OPENSTACK_TAG=stable/queens -ARG RALLY_TAG=stable/0.10 -ARG OS_FAULTS_TAG=0.1.16 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 7eb9eb292..252f10172 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -3,8 +3,8 @@ FROM opnfv/functest-core ARG BRANCH=master 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 @@ -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 && \ |