X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fholmes%2Fholmes-engine-mgt.yaml;h=bb046212ca7ffbc68091b5eb94e36ba5ff846ea5;hb=refs%2Fchanges%2F70%2F134470%2F1;hp=0788584070c34d7de86f596636116dac069cd3a3;hpb=88fabae196695f0a252049ecfe05d2cba73259b3;p=ci-management.git

diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml
index 078858407..bb046212c 100644
--- a/jjb/holmes/holmes-engine-mgt.yaml
+++ b/jjb/holmes/holmes-engine-mgt.yaml
@@ -1,58 +1,69 @@
 ---
 - project:
     name: holmes-engine-management
-    project-name: 'holmes-engine-management'
+    project-name: "holmes-engine-management"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - "{project-name}-{stream}-verify-java"
+      - "{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
-      - '{project-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: 'holmes/engine-management'
+          java-version: openjdk11
+          sbom-generator: true
+      - "{project-name}-{stream}-docker-java-daily":
+          mvn-params: "-Dmaven.test.skip=true"
+          build-node: ubuntu1804-docker-8c-8g
+          java-version: openjdk11
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+          java-version: openjdk11
+    project: "holmes/engine-management"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'holmes-engine-management-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
+      - "master":
+          branch: "master"
+    mvn-settings: "holmes-engine-management-settings"
+    files: "**"
+    archive-artifacts: ""
+    docker-pom: "pom.xml"
     mvn-profile: docker
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
+    java-version: openjdk11
 
 - project:
     name: holmes-engine-management-sonar
     jobs:
       - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'holmes/engine-management'
-    project-name: 'holmes-engine-management'
-    branch: 'master'
-    mvn-settings: 'holmes-engine-management-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    sonarcloud: true
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
+    build-node: ubuntu1804-builder-4c-4g
+    project: "holmes/engine-management"
+    project-name: "holmes-engine-management"
+    branch: "master"
+    mvn-settings: "holmes-engine-management-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    java-version: openjdk11
 
 - project:
     name: holmes-engine-management-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: holmes/engine-management
-    project-name: 'holmes-engine-management'
-    branch: 'master'
-    mvn-settings: 'holmes-engine-management-settings'
+    project-name: "holmes-engine-management"
+    branch: "master"
+    mvn-settings: "holmes-engine-management-settings"
+    java-version: openjdk11
 
 - project:
     name: holmes-engine-management-info
     project-name: holmes-engine-management
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: holmes/engine-management
     branch: master