Revert "Revert "Add multiplatform jobs for policy docker images""

This reverts commit 764bb8283a5cbf93ca9cbb8e2dd9760e783f9a78.

Re-enables the multiplatform jobs for policy docker images.

Signed-off-by: Bengt Thuree <bthuree@linuxfoundation.org>
Issue-ID: CIMAN-217
Change-Id: I34b81f193e6286792ace75be2a64f1a8ed19c9d8

1 files changed, 58 insertions, 3 deletions

diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index 4551f15c8..42f7f6bef 100644
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: policy-docker-base-common
+    name: policy-docker-base-common-elalto
     project-name: 'policy-docker'
     jobs:
       - '{project-name}-{stream}-verify-java'
@@ -20,8 +20,6 @@
 
     project: 'policy/docker'
     stream:
-      - 'master':
-          branch: 'master'
       - 'elalto':
           branch: 'elalto'
     mvn-settings: 'policy-docker-settings'
@@ -30,6 +28,63 @@
     build-node: ubuntu1604-builder-4c-4g
 
 - project:
+    name: policy-docker-base-common
+    project-name: 'policy-docker'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java':
+          project-name: 'policy-docker-amd64'
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
+          build-node: ubuntu1604-docker-8c-8g
+          pattern: 'do_not_match_any_file'
+      - '{project-name}-{stream}-merge-java':
+          project-name: 'policy-docker-arm64'
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
+          build-node: ubuntu1604-docker-arm64-4c-2g
+          pattern: 'do_not_match_any_file'
+      - '{project-name}-multiarch-{stream}-merge-java'
+      - gerrit-maven-docker-stage:
+          project-name: 'policy-docker-arm64'
+          build-node: ubuntu1604-docker-arm64-4c-2g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
+          container-public-registry: 'docker.io'
+          container-staging-registry: 'docker.io'
+          cron: ''
+          gerrit_trigger_file_paths:
+             - compare-type: REG_EXP
+               pattern: 'do_not_match_any_file'
+      - gerrit-maven-docker-stage:
+          project-name: 'policy-docker-amd64'
+          build-node: ubuntu1604-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
+          container-public-registry: 'docker.io'
+          container-staging-registry: 'docker.io'
+          cron: ''
+          gerrit_trigger_file_paths:
+             - compare-type: REG_EXP
+               pattern: 'do_not_match_any_file'
+      - '{project-name}-docker-manifest-{stream}':
+          build-node: ubuntu1604-docker-8c-8g
+      - '{project-name}-multiarch-docker-stage-{stream}'
+#      - '{project-name}-gerrit-release-jobs':
+#          build-node: centos7-builder-4c-4g
+
+    project: 'policy/docker'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'policy-docker-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-builder-4c-4g
+
+- project:
     name: policy-docker-sonar
     jobs:
       - gerrit-maven-sonar