Chore: Revert back to ubuntu1804-builder

[ci-management.git] / jjb / holmes / holmes-rule-mgt.yaml

diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml
index 089a55f..1177923 100644 (file)
--- a/jjb/holmes/holmes-rule-mgt.yaml
+++ b/jjb/holmes/holmes-rule-mgt.yaml
@@ -5,33 +5,55 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          java-version: openjdk11
+          sbom-generator: true
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+          java-version: openjdk11
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+          java-version: openjdk11
     project: 'holmes/rule-management'
     stream:
       - 'master':
           branch: 'master'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'holmes-rule-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-rule-management-sonar
     jobs:
       - 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/rule-management'
     project-name: 'holmes-rule-management'
     branch: 'master'
     mvn-settings: 'holmes-rule-management-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
 
 - project:
     name: holmes-rule-management-clm
@@ -42,11 +64,13 @@
     project-name: 'holmes-rule-management'
     branch: 'master'
     mvn-settings: 'holmes-rule-management-settings'
+    java-version: openjdk11
 
 - project:
     name: holmes-rule-management-info
     project-name: holmes-rule-management
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: holmes/rule-management
     branch: master