From b5112b8fa16243802471524428e54beeac4d4a3b Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Tue, 9 Oct 2018 09:45:32 +0200 Subject: Remove fds in all branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit FDS didn't participate to Gambia. Removing it in all branches avoids compexifying the jjbs. This patch will be reverted as soon as the support is ready. Change-Id: I9fb293b2972e0deb318ac9d3d08377039ea247e4 Signed-off-by: Cédric Ollivier (cherry picked from commit 2fd07adb36288e9247ad73a7344340c36754132e) --- docker/features/Dockerfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'docker/features/Dockerfile') diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index 292ebe696..194d23c21 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -2,7 +2,6 @@ FROM opnfv/functest-tempest:hunter ARG BRANCH=stable/hunter ARG OPENSTACK_TAG=stable/rocky -ARG FDS_TAG=master COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --update python3 sshpass && \ @@ -14,17 +13,13 @@ RUN apk --no-cache add --update python3 sshpass && \ > upper-constraints.txt && \ wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH | \ sed -E /#egg=functest/d > upper-constraints.opnfv.txt && \ - git init /src/fds && \ - (cd /src/fds && \ - git fetch --tags https://gerrit.opnfv.org/gerrit/fds $FDS_TAG && \ - git checkout FETCH_HEAD) && \ pip install --no-cache-dir --src /src -cupper-constraints.txt \ -cupper-constraints.opnfv.txt \ -rthirdparty-requirements.txt && \ python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt \ -cupper-constraints.opnfv.txt \ -rthirdparty-requirements.txt && \ - rm -r upper-constraints.txt upper-constraints.opnfv.txt thirdparty-requirements.txt /src/fds/.git && \ + rm -r upper-constraints.txt upper-constraints.opnfv.txt thirdparty-requirements.txt && \ apk del .build-deps COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] -- cgit 1.2.3-korg