Merge "Chore: Move to ubuntu2004-builder"

diff --combined jjb/dcaegen2/dcaegen2-services-mapper.yaml
index b0d6470,4d9c6c6..4346df2
--- 1/jjb/dcaegen2/dcaegen2-services-mapper.yaml
--- 2/jjb/dcaegen2/dcaegen2-services-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
@@@ -24,6 -24,8 +24,6 @@@
      stream:
        - 'master':
            branch: 'master'
 -      - 'istanbul':
 -          branch: 'istanbul'
        - 'jakarta':
            branch: 'jakarta'
      mvn-settings: 'dcaegen2-services-mapper-settings'
@@@ -46,7 -48,7 +46,7 @@@
      sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
      sonar-mvn-goal: '{sonar_mvn_goal}'
      cron: '@daily'
-     build-node: ubuntu1804-builder-4c-4g
+     build-node: ubuntu2004-builder-4c-4g
      project: 'dcaegen2/services/mapper'
      project-name: 'dcaegen2-services-mapper'
      branch: 'master'
@@@ -66,6 -68,8 +66,6 @@@
      stream:
        - 'master':
            branch: 'master'
 -      - 'istanbul':
 -          branch: 'istanbul'
      mvn-settings: 'dcaegen2-services-mapper-settings'
  
  - project:

diff --combined jjb/holmes/holmes-common.yaml
index 20e0f61,48adacc..aa26a48
--- 1/jjb/holmes/holmes-common.yaml
--- 2/jjb/holmes/holmes-common.yaml
+++ b/jjb/holmes/holmes-common.yaml
@@@ -16,7 -16,6 +16,7 @@@
            build-node: centos7-builder-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
@@@ -33,7 -32,7 +33,7 @@@
      mvn-settings: 'holmes-common-settings'
      files: '**'
      archive-artifacts: ''
-     build-node: ubuntu1804-builder-4c-4g
+     build-node: ubuntu2004-builder-4c-4g
      java-version: openjdk11
  
  - project:
@@@ -46,7 -45,7 +46,7 @@@
      sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
      sonar-mvn-goal: '{sonar_mvn_goal}'
      cron: '@daily'
-     build-node: ubuntu1804-builder-4c-4g
+     build-node: ubuntu2004-builder-4c-4g
      project: 'holmes/common'
      project-name: 'holmes-common'
      branch: 'master'

diff --combined jjb/holmes/holmes-engine-mgt.yaml
index 1c49166,5fcab2f..1196d39
--- 1/jjb/holmes/holmes-engine-mgt.yaml
--- 2/jjb/holmes/holmes-engine-mgt.yaml
+++ b/jjb/holmes/holmes-engine-mgt.yaml
@@@ -10,7 -10,6 +10,7 @@@
            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: ubuntu1804-docker-8c-8g
@@@ -33,7 -32,7 +33,7 @@@
      archive-artifacts: ''
      docker-pom: 'pom.xml'
      mvn-profile: docker
-     build-node: ubuntu1804-builder-4c-4g
+     build-node: ubuntu2004-builder-4c-4g
      java-version: openjdk11
  
  - project:
@@@ -46,7 -45,7 +46,7 @@@
      sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
      sonar-mvn-goal: '{sonar_mvn_goal}'
      cron: '@daily'
-     build-node: ubuntu1804-builder-4c-4g
+     build-node: ubuntu2004-builder-4c-4g
      project: 'holmes/engine-management'
      project-name: 'holmes-engine-management'
      branch: 'master'

diff --combined jjb/holmes/holmes-rule-mgt.yaml
index 1177923,857baf4..1b4f4e4
--- 1/jjb/holmes/holmes-rule-mgt.yaml
--- 2/jjb/holmes/holmes-rule-mgt.yaml
+++ b/jjb/holmes/holmes-rule-mgt.yaml
@@@ -10,7 -10,6 +10,7 @@@
            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: ubuntu1804-docker-8c-8g
@@@ -33,7 -32,7 +33,7 @@@
      archive-artifacts: ''
      docker-pom: 'pom.xml'
      mvn-profile: docker
-     build-node: ubuntu1804-builder-4c-4g
+     build-node: ubuntu2004-builder-4c-4g
      java-version: openjdk11
  
  - project:
@@@ -46,7 -45,7 +46,7 @@@
      sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
      sonar-mvn-goal: '{sonar_mvn_goal}'
      cron: '@daily'
-     build-node: ubuntu1804-builder-4c-4g
+     build-node: ubuntu2004-builder-4c-4g
      project: 'holmes/rule-management'
      project-name: 'holmes-rule-management'
      branch: 'master'