diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2017-09-04 12:49:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-04 12:49:32 +0000 |
| commit | 96eb11c116a15893a8e6af780fde3d675ad1b4d7 (patch) | |
| tree | a9b2b2471c76414b89413b3737733e561eafd3b1 /docker | |
| parent | 58e45d4c8d40c767f308b29d78255a4364ee50da (diff) | |
| parent | fa0c9ce8d0a0026660401c90478df2e975daf94b (diff) | |
Merge "Stop cloning doctor and domino"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/features/Dockerfile | 4 |
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"] |