summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-09-02 14:08:08 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-09-02 14:36:31 +0200
commitfa0c9ce8d0a0026660401c90478df2e975daf94b (patch)
treec53e9b5ecc0e96b0e1e36463b1c4e4ee4850f020 /docker
parentee12ace8b954f6232ed9cfc41364fb9420d678db (diff)
Stop cloning doctor and domino
Both testcases are disabled and the next reviews allow installing them via packages: - Add doctor-test package [1] - Add domino package [2] [1] https://gerrit.opnfv.org/gerrit/#/c/38177/ [2] https://gerrit.opnfv.org/gerrit/#/c/40911/ Change-Id: I03fc89c26f527e33417c17a8b1ab47d1c69c9a89 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile2
-rw-r--r--docker/features/Dockerfile4
2 files changed, 1 insertions, 5 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 774c00aee..51d28b90f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -92,8 +92,6 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe
rm thirdparty-requirements.txt upper-constraints.txt
# OPNFV repositories
-RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/domino /src/domino
-RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/doctor ${REPOS_DIR}/doctor
RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/fds /src/fds
# other repositories
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index af2a1ebe6..e1214c1e8 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -2,7 +2,6 @@ FROM opnfv/functest-core
ARG BRANCH=master
ARG OPENSTACK_TAG=stable/ocata
-ARG DOMINO_TAG=master
COPY thirdparty-requirements.txt thirdparty-requirements.txt
RUN apk --no-cache add --update nodejs nodejs-npm && \
@@ -15,8 +14,7 @@ RUN apk --no-cache add --update nodejs nodejs-npm && \
-rthirdparty-requirements.txt && \
npm -g install npm@latest && \
(cd /src/promise/source && npm install) && \
- git clone --depth 1 -b $DOMINO_TAG https://gerrit.opnfv.org/gerrit/domino /src/domino && \
- rm -r thirdparty-requirements.txt /src/domino/.git && \
+ rm -r thirdparty-requirements.txt && \
apk del .build-deps
COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml
CMD ["bash","-c","prepare_env start && run_tests -t all"]