aboutsummaryrefslogtreecommitdiffstats
path: root/docker/core/Dockerfile
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-11-13 21:18:29 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2017-11-13 23:59:12 +0100
commit0c7017df0852d0dc5e1bd0161cd7c930e87ba8e1 (patch)
treeab28beb4a4f1af613be2682e95b4267e60a87ad8 /docker/core/Dockerfile
parentc7290395d161c8c5fb4a4bf13d543e2a562b3ba1 (diff)
Move rally and tempest in functest-restapi
It completes the first patch which partially moved rally and tempest out of functest-core [1] by updating functest-restapi as well. os-faults is also installed in the right containers. [1] https://gerrit.opnfv.org/gerrit/#/c/47115/ Change-Id: Ia460dbe7785e2beffa5ba1a15f5a5bf2083b252a Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/core/Dockerfile')
-rw-r--r--docker/core/Dockerfile11
1 files changed, 1 insertions, 10 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 704f5d945..540746649 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -2,7 +2,6 @@ FROM alpine:3.6
ARG BRANCH=master
ARG OPENSTACK_TAG=stable/pike
-ARG OS_FAULTS_TAG=0.1.16
RUN apk --no-cache add --update \
python libffi libssl1.0 libjpeg-turbo py-pip bash \
@@ -16,15 +15,7 @@ RUN apk --no-cache add --update \
(cd /src/functest && git fetch origin $BRANCH && git checkout FETCH_HEAD) && \
pip install --no-cache-dir --src /src -cupper-constraints.txt \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
- -e git+https://github.com/openstack/requirements@$OPENSTACK_TAG#egg=openstack_requirements && \
- git clone --depth 1 https://github.com/openstack/os-faults.git -b $OS_FAULTS_TAG /src/os-faults && \
- update-requirements -s --source /src/openstack-requirements /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/os-faults && \
- pip install --no-cache-dir --src /src -cupper-constraints.txt \
- -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
/src/functest && \
- rm -r upper-constraints.txt /src/functest /src/os-faults/.git && \
+ rm -r upper-constraints.txt /src/functest && \
bash -c "mkdir -p /home/opnfv/functest{/conf,/data,/images,/results} /home/opnfv/repos/vnfs" && \
apk del .build-deps