From be94cc1a5b68a5e789989f898a33be3becb13068 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dt5972@att.com>
Date: Mon, 2 Jul 2018 18:02:35 -0400
Subject: Install ansible apt repo manually

add-apt-repository does not work on ONAP Jenkins, so install ansible
apt repo manually

Change-Id: I91d1ae7044f95ac536433d10b347fc60db3bd870
Issue-ID: CCSDK-285
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
---
 odlsli/pom.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'odlsli/pom.xml')

diff --git a/odlsli/pom.xml b/odlsli/pom.xml
index d9aa5a2b..1b573601 100644
--- a/odlsli/pom.xml
+++ b/odlsli/pom.xml
@@ -30,6 +30,7 @@
 		<opendaylight.root>opt/opendaylight</opendaylight.root>
 		<docker.push.phase>deploy</docker.push.phase>
 		<docker.verbose>true</docker.verbose>
+		<ansible.gpg.key>93C4A3FD7BB9C367</ansible.gpg.key>
 	</properties>
 
 	<dependencies>
@@ -177,6 +178,14 @@
 	</dependencies>
 
 	<build>
+	<extensions>
+		<extension>
+			<!-- this extension is required by wagon in order to pass the proxy -->
+			<groupId>org.apache.maven.wagon</groupId>
+			<artifactId>wagon-http-lightweight</artifactId>
+			<version>2.2</version>
+		</extension>
+	</extensions>
 		<plugins>
 
 
@@ -197,7 +206,8 @@
 								    versionArray = project.properties['ccsdk.project.version'].split('\\.');
 								}
 
-								if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT")) {
+								if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT"))
+								{
 								    project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
 								} else {
 								    project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
@@ -271,6 +281,7 @@
 										<include>idmlight.db.mv.db</include>
 										<include>org.ops4j.pax.logging.cfg</include>
 										<include>install_ccsdk.yml</include>
+										<include>ansible-sources.list</include>
 									</includes>
 									<filtering>false</filtering>
 								</resource>
-- 
cgit 1.2.3-korg