From: Cédric Ollivier Date: Sat, 2 Sep 2017 09:54:11 +0000 (+0200) Subject: Unlink Functest and Domino tags X-Git-Tag: 0.2~362^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=05a54e2c30ef4050da42683b35d04c984f53bd8c;p=functest-xtesting.git Unlink Functest and Domino tags Otherwise it forbids building functest from a gerrit changes. DOMINO_TAG will be removed as soon as Domino offers a Python package. Change-Id: I081d468ff563c0be43b03fbae6c4899ed7824220 Signed-off-by: Cédric Ollivier --- diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index 54bffe82..af2a1ebe 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -2,6 +2,7 @@ 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 && \ @@ -14,7 +15,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 $BRANCH https://gerrit.opnfv.org/gerrit/domino /src/domino && \ + git clone --depth 1 -b $DOMINO_TAG https://gerrit.opnfv.org/gerrit/domino /src/domino && \ rm -r thirdparty-requirements.txt /src/domino/.git && \ apk del .build-deps COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml