From 05d1e18373779df333d1f1fa30cc4891a8da59a4 Mon Sep 17 00:00:00 2001
From: Jerry Flood <jflood@att.com>
Date: Fri, 26 Jul 2019 12:48:41 -0400
Subject: Cleanup POMs and Dockerfiles

Issue-ID: OPTFRA-539

Change-Id: I94da0bc947b4cbb226c5e248c85c8d87f799c659
Signed-off-by: Jerry Flood <jflood@att.com>
---
 cmso-robot/pom.xml | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'cmso-robot/pom.xml')

diff --git a/cmso-robot/pom.xml b/cmso-robot/pom.xml
index 0a7696b..8137e74 100644
--- a/cmso-robot/pom.xml
+++ b/cmso-robot/pom.xml
@@ -34,23 +34,12 @@
 	<description>Robot Framework for testing CMSO  Service</description>
 
 	<properties>
-		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-
-		<cmso.project.version>${project.version}</cmso.project.version>
-		<cmso.build.timestamp>${maven.build.timestamp}</cmso.build.timestamp>
-
-		<release-tag>Dublin</release-tag>
 		<service.name>cmso-robot</service.name>
-		<name.space>org.onap.optf</name.space>
 		<serviceArtifactName>cmso-robot</serviceArtifactName>
 
 		<build.number>${maven.build.timestamp}</build.number>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-
-		<docker.push.registry>localhost:5000</docker.push.registry>
-		<docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
 		<docker.skip.build>false</docker.skip.build>
 		<docker.skip.push>false</docker.skip.push>
 		<docker.skip.tag>false</docker.skip.tag>
@@ -96,7 +85,7 @@
 					<apiVersion>1.23</apiVersion>
 					<images>
 						<image>
-							<name>onap/optf-cmso-robot</name>
+							<name>${image.namespace}/optf-cmso-robot</name>
 							<alias>onap-optf-cmso-robot</alias>
 							<build>
 								<cleanup>true</cleanup>
@@ -110,7 +99,12 @@
 									<descriptor>${project.basedir}/docker/assembly/cmso-files.xml</descriptor>
 									<name>onap-cmso</name>
 								</assembly>
-
+								<args>
+									<!-- plugin cannot handle empty (no proxy) arguments
+									<http_proxy_arg>${docker.http_proxy}</http_proxy_arg>
+									<https_proxy_arg>${docker.https_proxy}</https_proxy_arg>
+									-->
+								</args>	
 							</build>
 						</image>
 					</images>
@@ -131,7 +125,7 @@
 							<goal>push</goal>
 						</goals>
 						<configuration>
-							<image>onap/optf-cmso-robot:%l</image>
+							<image>${image.namespace}/optf-cmso-robot:%l</image>
 						</configuration>
 					</execution>
 				</executions>
-- 
cgit 1.2.3-korg