From 9c74c5729c9a52268342e583d6493bb19df80aa6 Mon Sep 17 00:00:00 2001
From: Taka Cho <takamune.cho@att.com>
Date: Tue, 8 Oct 2019 22:11:26 -0400
Subject: Neon SR1 upgrade

change pom files for
ODL Neon SR1 upgrade

Issue-ID: APPC-1749
Change-Id: Ib10ff74852a2b38933c0df034c71e21665430f62
Signed-off-by: Taka Cho <takamune.cho@att.com>
---
 appc-oam/appc-oam-installer/pom.xml                  |  2 +-
 .../src/main/resources/scripts/install-feature.sh    | 20 +++-----------------
 2 files changed, 4 insertions(+), 18 deletions(-)

(limited to 'appc-oam/appc-oam-installer')

diff --git a/appc-oam/appc-oam-installer/pom.xml b/appc-oam/appc-oam-installer/pom.xml
index eaa7b3766..3360b2f16 100644
--- a/appc-oam/appc-oam-installer/pom.xml
+++ b/appc-oam/appc-oam-installer/pom.xml
@@ -27,7 +27,7 @@
 		<groupId>org.onap.appc.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
 		<version>2.7.0-SNAPSHOT</version>
-                <relativePath />
+                <relativePath/>
 	</parent>
         <groupId>org.onap.appc</groupId>
   
diff --git a/appc-oam/appc-oam-installer/src/main/resources/scripts/install-feature.sh b/appc-oam/appc-oam-installer/src/main/resources/scripts/install-feature.sh
index 47a6ea4dd..5c077e86b 100755
--- a/appc-oam/appc-oam-installer/src/main/resources/scripts/install-feature.sh
+++ b/appc-oam/appc-oam-installer/src/main/resources/scripts/install-feature.sh
@@ -36,13 +36,10 @@ then
 
 fi
 
-#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
-#
-
-
 COUNT=0
 while [ $COUNT -lt 10 ]; do
-	${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr
+#	${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr
+sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" 2> /tmp/installErr
 	cat /tmp/installErr
 	if grep -q 'Failed to get the session' /tmp/installErr; then
 		sleep 10
@@ -50,15 +47,4 @@ while [ $COUNT -lt 10 ]; do
 		let COUNT=10
 	fi
 	let COUNT=COUNT+1
-done
-COUNT=0
-while [ $COUNT -lt 10 ]; do
-	 2> /tmp/installErr
-		cat /tmp/installErr
-	if grep -q 'Failed to get the session' /tmp/installErr; then
-		sleep 10
-	else
-		let COUNT=10
-	fi
-	let COUNT=COUNT+1
-done
+done
\ No newline at end of file
-- 
cgit 1.2.3-korg