X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fpolicy%2Fpolicy-gui.yaml;h=6c43884a36296a3c22b3a6218f989705a9545b8f;hb=2197d45863af3496355dda957fabed01be445a8f;hp=924ea37868bd21cd62763dcc865fed81730d7e8f;hpb=61a5118c5953e8038f4ab3bf528ce434dc67b4ce;p=ci-management.git

diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index 924ea3786..6c43884a3 100644
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -7,41 +7,46 @@
       - '{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'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'policy/gui'
     stream:
       - 'master':
           branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'policy-gui-settings'
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-gui-sonar
     jobs:
-      - gerrit-maven-sonar
+      - gerrit-maven-sonar-prescan-script
     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/gui'
     project-name: 'policy-gui'
     branch: 'master'
@@ -49,6 +54,7 @@
     java-version: openjdk11
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh
 
 - project:
     name: policy-gui-clm
@@ -57,7 +63,9 @@
     nexus-iq-namespace: 'onap-'
     project: policy/gui
     project-name: 'policy-gui'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
     mvn-settings: 'policy-gui-settings'
     java-version: openjdk11
 
@@ -66,5 +74,6 @@
     project-name: policy-gui
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/gui
     branch: master