X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fpolicy%2Fpolicy-api.yaml;h=cf814269b890f7fc817d7f91512fd3b1e4dc1fe4;hb=2197d45863af3496355dda957fabed01be445a8f;hp=2e1167d058c0bd36261ecfad2cac0a92ed39592b;hpb=14622f691549dd251760123d4145e692d756058d;p=ci-management.git

diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 2e1167d05..cf814269b 100644
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -7,13 +7,14 @@
       - '{project-name}-{stream}-merge-java':
           docker-pom: 'pom.xml'
           mvn-params: '-P docker'
-          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
+          mvn-params: '-Dmaven.test.skip=true'
       - 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'
@@ -25,11 +26,17 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-api-settings'
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-api-sonar
@@ -39,9 +46,9 @@
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'policy/api'
     project-name: 'policy-api'
     branch: 'master'
@@ -57,7 +64,9 @@
     nexus-iq-namespace: 'onap-'
     project: policy/api
     project-name: 'policy-api'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
     mvn-settings: 'policy-api-settings'
     java-version: openjdk11
 
@@ -66,5 +75,6 @@
     project-name: policy-api
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/api
     branch: master