From: Julien Barbot <julien@barbot.org>
Date: Fri, 21 Sep 2018 15:13:06 +0000 (+0200)
Subject: Use release candidate versions of PNDA
X-Git-Tag: 1.4.1~2^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=787938146b29639cd8bfe0308d0ebd6e89b6a800;p=dcaegen2%2Fdeployments.git

Use release candidate versions of PNDA

Change-Id: Id211bc0d5dc9ef8e98d2af6b6944e67ea6bfdfa7
Signed-off-by: Julien Barbot <julien@barbot.org>
Issue-ID: DCAEGEN2-367
Signed-off-by: Julien Barbot <julien@barbot.org>
---

diff --git a/pnda-bootstrap-container/Dockerfile b/pnda-bootstrap-container/Dockerfile
index 6a93aa9..1b90d65 100644
--- a/pnda-bootstrap-container/Dockerfile
+++ b/pnda-bootstrap-container/Dockerfile
@@ -18,12 +18,11 @@
 
 FROM python:2.7.15 as build
 
-ARG PNDARELEASE=develop
+ARG PNDACLITAG=2.0.0
+ARG PLATFORMSALTTAG=5.0.0
 
-# RUN git clone -b $PNDARELEASE https://github.com/pndaproject/pnda-cli.git
-# Use this repository temporary until it's merged into PNDA upstream
-RUN git clone -b existing-network https://github.com/donaldh/pnda-cli.git
-RUN git clone -b $PNDARELEASE https://github.com/pndaproject/platform-salt.git
+RUN git clone -b $PNDACLITAG https://github.com/pndaproject/pnda-cli.git
+RUN git clone -b $PLATFORMSALTTAG https://github.com/pndaproject/platform-salt.git
 
 RUN pip2 install --no-cache-dir -r pnda-cli/cli/requirements.txt --install-option="--prefix=/install"