X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fholmes%2Fholmes-common.yaml;h=cb43d25582cc52e8f062799b7b7e2debb0add0fb;hb=6343b32a1e48a92a61c92379773975fb2d4d74d1;hp=3f8816ea20549a85f92d0835116aa1619da67808;hpb=5c03e71aa37367f422c0ce0cc41b521f37a2e12e;p=ci-management.git

diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml
index 3f8816ea2..cb43d2558 100644
--- a/jjb/holmes/holmes-common.yaml
+++ b/jjb/holmes/holmes-common.yaml
@@ -13,11 +13,13 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
+          java-version: openjdk11
+          sbom-generator: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
-
+          java-version: openjdk11
     project: 'holmes/common'
     stream:
       - 'master':
@@ -25,7 +27,8 @@
     mvn-settings: 'holmes-common-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
+    java-version: openjdk11
 
 - project:
     name: holmes-common-sonar
@@ -33,17 +36,17 @@
       - 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: 'holmes/common'
     project-name: 'holmes-common'
     branch: 'master'
     mvn-settings: 'holmes-common-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
 
 - project:
     name: holmes-common-clm
@@ -54,12 +57,13 @@
     project-name: 'holmes-common'
     branch: 'master'
     mvn-settings: 'holmes-common-settings'
+    java-version: openjdk11
 
 - project:
     name: holmes-common-info
     project-name: holmes-common
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: holmes/common
     branch: master