X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fexternalapi%2Fexternalapi-nbi.yaml;h=6bda3cba0d37b32a04ecb02257b363536419078b;hb=ffc3ac818c92944c9b956633550a461457d10d36;hp=66e40e59c63caaa786e9f31312eb7712b56b1d3c;hpb=c0ad7406de27aa3dc3fbc1c5c8fd7d15cd73dc7e;p=ci-management.git

diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml
index 66e40e59c..6bda3cba0 100644
--- a/jjb/externalapi/externalapi-nbi.yaml
+++ b/jjb/externalapi/externalapi-nbi.yaml
@@ -11,27 +11,28 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-docker-stage:
+      - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
+          mvn-params: '-Dmaven.test.skip=true'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-Dmaven.test.skip=true'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: 'ubuntu1604-docker-8c-8g'
+          mvn-params: '-Dmaven.test.skip=true -P docker'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'externalapi/nbi'
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'externalapi-nbi-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: externalapi-nbi-arm64
@@ -41,7 +42,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
-          build-node: 'ubuntu1604-docker-arm64-4c-2g'
+          build-node: 'ubuntu1804-docker-arm64-4c-2g'
     project: 'externalapi/nbi'
     stream:
       - 'master':
@@ -61,24 +62,33 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'externalapi-nbi-settings'
+    java-version: openjdk11
 
 - project:
     name: externalapi-nbi-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: 'externalapi/nbi'
     project-name: 'externalapi-nbi'
     branch: 'master'
     mvn-settings: 'externalapi-nbi-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
+    sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh
 
 - project:
     name: externalapi-nbi-info
     project-name: externalapi-nbi
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: externalapi/nbi
     branch: master