X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fpolicy%2Fpolicy-docker-base-common.yaml;h=e77343a4b9ac28a2554ed3d2cf54c6918a092570;hb=2197d45863af3496355dda957fabed01be445a8f;hp=63daef949ab724ce0c58a556c37841f10d47a70d;hpb=7fd0160b6b6f1c98e9c29fea01d28250910de40c;p=ci-management.git

diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index 63daef949..e77343a4b 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-elalto
+    name: policy-docker-base-common
     project-name: 'policy-docker'
     jobs:
       - '{project-name}-{stream}-verify-java'
@@ -8,81 +8,35 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: "-P docker"
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
-
-    project: 'policy/docker'
-    stream:
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'policy-docker-settings'
-    files: '**'
-    archive-artifacts: ''
-    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-docker-8c-8g
+    mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
+    java-version: openjdk11
 
     project: 'policy/docker'
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-docker-settings'
+    mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-docker-clm
@@ -91,13 +45,18 @@
     nexus-iq-namespace: 'onap-'
     project: policy/docker
     project-name: 'policy-docker'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
     mvn-settings: 'policy-docker-settings'
+    mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
+    java-version: openjdk11
 
 - project:
     name: policy-docker-info
     project-name: policy-docker
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/docker
     branch: master