From 0c7017df0852d0dc5e1bd0161cd7c930e87ba8e1 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 13 Nov 2017 21:18:29 +0100 Subject: Move rally and tempest in functest-restapi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- docker/core/Dockerfile | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'docker/core') diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 704f5d94..54074664 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 \ @@ -14,17 +13,9 @@ RUN apk --no-cache add --update \ > upper-constraints.txt && \ git clone https://gerrit.opnfv.org/gerrit/functest /src/functest && \ (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 -- cgit 1.2.3-korg