From b02fae805ebacd642ca4bc786359a8e2f9d3d201 Mon Sep 17 00:00:00 2001
From: Pamela Dragosh <pdragosh@research.att.com>
Date: Fri, 20 Mar 2020 13:55:59 +0000
Subject: Revert "Add docker manifest file to build onap/policy-pap"

This reverts commit fcec4180525b4b97d4739c7fa7915f7be0a9709b.

Reason for revert: This work is not mature enough for release.

Issue-ID: POLICY-1997
Change-Id: I6afd45958c45d657c30f2c0467c55f7f10b5024e
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
---
 packages/policy-pap-docker/pom.xml | 45 ++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 26 deletions(-)

(limited to 'packages')

diff --git a/packages/policy-pap-docker/pom.xml b/packages/policy-pap-docker/pom.xml
index 2872cbe2..0615cf2b 100644
--- a/packages/policy-pap-docker/pom.xml
+++ b/packages/policy-pap-docker/pom.xml
@@ -41,8 +41,8 @@
         <docker.skip>false</docker.skip>
         <docker.skip.build>false</docker.skip.build>
         <docker.skip.push>false</docker.skip.push>
-        <docker.pull.registry>docker.io</docker.pull.registry>
-        <docker.push.registry>docker.io</docker.push.registry>
+        <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
+        <docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
     </properties>
 
@@ -55,33 +55,25 @@
                 <version>1.0</version>
                 <executions>
                     <execution>
-                        <phase>pre-clean</phase>
+                        <phase>validate</phase>
                         <goals>
                             <goal>execute</goal>
                         </goals>
                         <configuration>
                             <source>
-                                println 'Project version: ' + project.properties['dist.project.version'];
-                                def versionArray;
-                                if ( project.properties['dist.project.version'] != null ) {
-                                    versionArray = project.properties['dist.project.version'].split('-');
-                                }
-
-                                if ( project.properties['dist.project.version'].endsWith("-SNAPSHOT") ) {
-                                    project.properties['project.docker.latesttag.version']=versionArray[0] + "-SNAPSHOT-latest";
-                                } else {
-                                    project.properties['project.docker.latesttag.version']=versionArray[0] + "-STAGING-latest";
-                                }
-
-                                println 'New tag for docker: ' + project.properties['project.docker.latesttag.version'];
-
-                                println 'The arch is: ' + System.properties['os.arch'];
-                                if ( "aarch64".equals(System.properties['os.arch']) ) {
-                                    project.properties['project.docker.arch'] = "arm64";
-                                } else {
-                                    project.properties['project.docker.arch'] = System.properties['os.arch'];
+                                println 'Project version: ' + project.properties['dist.project.version']
+                                if (project.properties['dist.project.version'] != null) {
+                                    def versionArray = project.properties['dist.project.version'].split('-')
+                                    def minMaxVersionArray = versionArray[0].tokenize('.')
+                                    if (project.properties['dist.project.version'].endsWith("-SNAPSHOT")) {
+                                        project.properties['project.docker.latest.minmax.tag.version'] =
+                                            minMaxVersionArray[0] + "." + minMaxVersionArray[1] + "-SNAPSHOT-latest"
+                                    } else {
+                                        project.properties['project.docker.latest.minmax.tag.version'] =
+                                            minMaxVersionArray[0] + "." + minMaxVersionArray[1] + "-STAGING-latest"
+                                    }
+                                    println 'New tag for docker: ' + project.properties['project.docker.latest.minmax.tag.version']
                                 }
-                                println 'Using arch for docker: ' + project.properties['project.docker.arch'];
                             </source>
                         </configuration>
                     </execution>
@@ -100,13 +92,14 @@
 
                     <images>
                         <image>
-                            <name>onap/policy-pap:latest-${project.docker.arch}</name>
+                            <name>onap/policy-pap</name>
                             <build>
                                 <cleanup>try</cleanup>
                                 <dockerFile>Dockerfile</dockerFile>
                                 <tags>
-                                    <tag>${project.version}-${project.docker.arch}</tag>
-                                    <tag>${project.docker.latesttag.version}-${project.docker.arch}</tag>
+                                    <tag>${project.version}</tag>
+                                    <tag>${project.version}-${maven.build.timestamp}</tag>
+                                    <tag>${project.docker.latest.minmax.tag.version}</tag>
                                 </tags>
                                 <assembly>
                                     <inline>
-- 
cgit 1.2.3-korg