From 4da9d4476fe968d3b915f7ca28b22bb322899614 Mon Sep 17 00:00:00 2001
From: Paul Vaduva <Paul.Vaduva@enea.com>
Date: Thu, 27 Jun 2019 18:00:57 +0200
Subject: Multiplatform support for policy

Add multiplatfrom support for policy-base
and policy-common docker images:
   - the pom.xml files are modified to push and pull from dockerhub instead
     of nexus repository (as nexus lacks support for manifest list)
   - for each image that is built with maven, an arch suffix is added to the
     tag. The currently supported architectures are amd64 and arm64.
   - the creation of the timestamped tag is moved from the pom.xml files to
     the docker_push_manifest.sh script
   - for each image built via the Jenkins CI jobs, the docker_push_manifest.sh
     is called. The script pushes a manifest list for each tag, plus it
     creates the timestamp tags for SNAPSHOT or STAGING images,
     depending on what job called the script (merge job, or stag job)

For using the images, the name of the manifest list is to be used (which
is the same as the current images in nexus)

Issue-ID: POLICY-1997
Change-Id: If54e7ee6ac432a999844d3584e146a90e2247323
Signed-off-by: Paul Vaduva <Paul.Vaduva@enea.com>
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
 policy-base/alpine/pom.xml | 17 +++++++++++------
 policy-base/pom.xml        |  7 +++----
 2 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'policy-base')

diff --git a/policy-base/alpine/pom.xml b/policy-base/alpine/pom.xml
index 028cf466..d58a7772 100644
--- a/policy-base/alpine/pom.xml
+++ b/policy-base/alpine/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.policy.docker</groupId>
         <artifactId>policy-base</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <packaging>pom</packaging>
@@ -43,7 +43,7 @@
                 <version>1.0</version>
                 <executions>
                     <execution>
-                        <phase>validate</phase>
+                        <phase>pre-clean</phase>
                         <goals>
                             <goal>execute</goal>
                         </goals>
@@ -62,6 +62,12 @@
                                 }
 
                                 println 'New tag for docker: ' + project.properties['project.docker.latesttag.version'];
+                                if ( "aarch64".equals(System.properties['os.arch']) ) {
+                                    project.properties['project.docker.arch'] = "arm64";
+                                } else {
+                                    project.properties['project.docker.arch'] = System.properties['os.arch'];
+                                }
+                                println 'Using arch for docker: ' + project.properties['project.docker.arch'];
                             </source>
                         </configuration>
                     </execution>
@@ -79,14 +85,13 @@
 
                     <images>
                         <image>
-                            <name>onap/policy-base-alpine</name>
+                            <name>onap/policy-base-alpine:latest-${project.docker.arch}</name>
                             <build>
                                 <cleanup>try</cleanup>
                                 <dockerFile>Dockerfile</dockerFile>
                                 <tags>
-                                    <tag>${project.version}</tag>
-                                    <tag>${project.version}-${maven.build.timestamp}</tag>
-                                    <tag>${project.docker.latesttag.version}</tag>
+                                    <tag>${project.version}-${project.docker.arch}</tag>
+                                    <tag>${project.docker.latesttag.version}-${project.docker.arch}</tag>
                                 </tags>
                             </build>
                         </image>
diff --git a/policy-base/pom.xml b/policy-base/pom.xml
index bae9e63c..ac4eaca3 100644
--- a/policy-base/pom.xml
+++ b/policy-base/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.docker</groupId>
         <artifactId>docker</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>policy-base</artifactId>
@@ -37,9 +37,8 @@
         <docker.skip>false</docker.skip>
         <docker.skip.build>false</docker.skip.build>
         <docker.skip.push>false</docker.skip.push>
-        <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>
+        <docker.pull.registry>docker.io</docker.pull.registry>
+        <docker.push.registry>docker.io</docker.push.registry>
     </properties>
 
     <profiles>
-- 
cgit 1.2.3-korg