X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fpolicy%2Fpolicy-distribution.yaml;h=f614feba380ac19ae5f36e5ae11c3f63d8500fa4;hb=a4efc812629fef145dabc64bdf09b39748d592a5;hp=6c5753c697e0cf9e896612dc2215d92ea4811bcb;hpb=ec1b3b0200439717f301a97755e48016460522d1;p=ci-management.git

diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index 6c5753c69..f614feba3 100644
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -7,58 +7,50 @@
       - '{project-name}-{stream}-merge-java':
           docker-pom: 'pom.xml'
           mvn-params: '-P docker'
-          build-node: ubuntu1604-docker-8c-8g
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          disabled: false
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          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/distribution'
     stream:
       - 'master':
           branch: 'master'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'policy-distribution-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
-- project:
-    name: policy-distribution-casablanca
-    project-name: 'policy-distribution-casablanca'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-params: '-P docker'
-          build-node: ubuntu1604-docker-8c-8g
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          disabled: true
-          build-node: ubuntu1604-docker-8c-8g
-
-    project: 'policy/distribution'
-    stream:
-      - 'casablanca':
-          branch: 'casablanca'
-    mvn-settings: 'policy-distribution-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-distribution-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'policy/distribution'
     project-name: 'policy-distribution'
     branch: 'master'
     mvn-settings: 'policy-distribution-settings'
+    java-version: openjdk11
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
@@ -71,11 +63,13 @@
     project-name: 'policy-distribution'
     branch: 'master'
     mvn-settings: 'policy-distribution-settings'
+    java-version: openjdk11
 
 - project:
     name: policy-distribution-info
     project-name: policy-distribution
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/distribution
     branch: master