From 6f0c0101dcb421c75a1a49bea02d1dc7479ef7d1 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dt5972@att.com>
Date: Mon, 18 Jun 2018 23:01:08 -0400
Subject: [PATCH] Update odlsli for ODL Oxygen

Update odlsli to use ODL Oxygen as base container and to support local
docker builds for testing.

Change-Id: Ie615896e56177bf4b239ec080f09c50d8c16c0c5
Issue-ID: CCSDK-285
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
---
 odlsli/pom.xml                    | 3 ++-
 odlsli/src/main/docker/Dockerfile | 2 +-
 opendaylight/nitrogen/pom.xml     | 2 +-
 opendaylight/oxygen/pom.xml       | 3 ++-
 opendaylight/pom.xml              | 1 -
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/odlsli/pom.xml b/odlsli/pom.xml
index 89054955..7a63ca23 100644
--- a/odlsli/pom.xml
+++ b/odlsli/pom.xml
@@ -26,6 +26,7 @@
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+	<docker.push.phase>deploy</docker.push.phase>
     </properties>
 
     <dependencies>
@@ -400,7 +401,7 @@
 
                             <execution>
                                 <id>push-images</id>
-                                <phase>deploy</phase>
+                                <phase>${docker.push.phase}</phase>
                                 <goals>
                                     <goal>build</goal>
                                     <goal>push</goal>
diff --git a/odlsli/src/main/docker/Dockerfile b/odlsli/src/main/docker/Dockerfile
index a31fcff4..f6aeda6d 100644
--- a/odlsli/src/main/docker/Dockerfile
+++ b/odlsli/src/main/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Base ubuntu with added packages needed for open ecomp
-FROM onap/ccsdk-odl-image:${project.version}
+FROM onap/ccsdk-odl-oxygen-image:${project.version}
 MAINTAINER CCSDK Team (onap-ccsdk@lists.openecomp.org)
 ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
 ENV ODL_HOME /opt/opendaylight/current
diff --git a/opendaylight/nitrogen/pom.xml b/opendaylight/nitrogen/pom.xml
index 7e68f61c..589184c8 100644
--- a/opendaylight/nitrogen/pom.xml
+++ b/opendaylight/nitrogen/pom.xml
@@ -19,7 +19,7 @@
     </organization>
 
     <properties>
-        <image.name>onap/ccsdk-odl-image</image.name>
+        <image.name>onap/ccsdk-odl-nitrogen-image</image.name>
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
         <ccsdk.opendaylight.version>0.7.1</ccsdk.opendaylight.version>
         <ccsdk.mariadb-connector-java.version>2.1.1</ccsdk.mariadb-connector-java.version>
diff --git a/opendaylight/oxygen/pom.xml b/opendaylight/oxygen/pom.xml
index 4ecc62b3..5ef52b67 100644
--- a/opendaylight/oxygen/pom.xml
+++ b/opendaylight/oxygen/pom.xml
@@ -24,6 +24,7 @@
         <ccsdk.opendaylight.version>0.8.1</ccsdk.opendaylight.version>
         <ccsdk.mariadb-connector-java.version>2.1.1</ccsdk.mariadb-connector-java.version>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
+	<docker.push.phase>deploy</docker.push.phase>
     </properties>
 
     <dependencyManagement>
@@ -203,7 +204,7 @@
 
                             <execution>
                                 <id>push-images</id>
-                                <phase>install</phase>
+                                <phase>${docker.push.phase}</phase>
                                 <goals>
                                     <goal>build</goal>
                                     <goal>push</goal>
diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml
index a72076d1..6afc14d2 100644
--- a/opendaylight/pom.xml
+++ b/opendaylight/pom.xml
@@ -16,7 +16,6 @@
     <description>Creates OpenDaylight container</description>
 
     <modules>
-    	    <module>nitrogen</module>
     	    <module>oxygen</module>
     </modules>
 </project>
-- 
2.16.6