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: 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>
---
 opendaylight/nitrogen/pom.xml | 2 +-
 opendaylight/oxygen/pom.xml   | 3 ++-
 opendaylight/pom.xml          | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'opendaylight')

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>
-- 
cgit 1.2.3-korg