From 05a54e2c30ef4050da42683b35d04c984f53bd8c Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Sat, 2 Sep 2017 11:54:11 +0200
Subject: Unlink Functest and Domino tags
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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 <cedric.ollivier@orange.com>
---
docker/features/Dockerfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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
--
cgit