From dab0be7327dffdbfe220c96e265706dc919f6374 Mon Sep 17 00:00:00 2001
From: Jack Lucas <jflucas@research.att.com>
Date: Thu, 23 May 2019 18:21:17 -0400
Subject: Pull DCAE plugins from Nexus

Change-Id: Ifca0978cca90e00f0ad59702b2024d0970df8ec9
Issue-ID: DCAEGEN2-1520
Signed-off-by: Jack Lucas <jflucas@research.att.com>
---
 k8s-bootstrap-container/build-plugins.sh | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'k8s-bootstrap-container/build-plugins.sh')

diff --git a/k8s-bootstrap-container/build-plugins.sh b/k8s-bootstrap-container/build-plugins.sh
index e331c66..786d58e 100755
--- a/k8s-bootstrap-container/build-plugins.sh
+++ b/k8s-bootstrap-container/build-plugins.sh
@@ -28,15 +28,13 @@
 set -x
 DEST=wagons
 
-# For DCAE, we get zips of the archives and build wagons
-# 2 versions of k8s plugin to ease transition
+# For DCAE, starting in R5, we pull down wagons directly
 DCAEPLUGINFILES=\
 "\
-k8splugin/1.4.5/k8splugin-1.4.5.tgz
-k8splugin/1.4.13/k8splugin-1.4.13.tgz
-relationshipplugin/1.0.0/relationshipplugin-1.0.0.tgz
-clamppolicyplugin/1.0.0/clamppolicyplugin-1.0.0.tgz
-dcaepolicyplugin/2.3.0/dcaepolicyplugin-2.3.0.tgz \
+k8splugin/1.4.13/k8splugin-1.4.13-py27-none-linux_x86_64.wgn
+relationshipplugin/1.0.0/relationshipplugin-1.0.0-py27-none-any.wgn
+clamppolicyplugin/1.0.0/clamppolicyplugin-1.0.0-py27-none-any.wgn
+dcaepolicyplugin/2.3.0/dcaepolicyplugin-2.3.0-py27-none-any.wgn \
 "
 
 # For CCSDK, we pull down the wagon files directly
@@ -48,6 +46,7 @@ plugins/sshkeyshare-1.0.0-py27-none-any.wgn
 plugins/helm-4.0.0-py27-none-linux_x86_64.wgn
 "
 
+# Not needed in R5
 # Build a set of wagon files from archives in a repo
 # $1 -- repo base URL
 # $2 -- list of paths to archive files in the repo
@@ -77,5 +76,5 @@ function get_wagons {
 }
 
 mkdir ${DEST}
-build $1 "${DCAEPLUGINFILES}"
+get_wagons $1 "${DCAEPLUGINFILES}"
 get_wagons $2 "${CCSDKPLUGINFILES}"
-- 
cgit 1.2.3-korg