Chore: Move to ubuntu2004-builder

[ci-management.git] / jjb / dcaegen2 / dcaegen2-services-mapper.yaml

diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
index cde857b..4d9c6c6 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
@@ -4,15 +4,17 @@
     project-name: 'dcaegen2-services-mapper'
     java-version: openjdk11
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify:
+          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
+      - gerrit-maven-merge
       - gerrit-maven-stage:
           sign-artifacts: true
+          sbom-generator: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
-          mvn-goals: 'clean package docker:build -DpushImage'
+          mvn-goals: 'clean package docker:build -DpushImageTag'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
@@ -22,9 +24,13 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'dcaegen2-services-mapper-settings'
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1804-docker-8c-8g'
@@ -42,7 +48,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'
@@ -59,7 +65,11 @@
     project: dcaegen2/services/mapper
     build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-services-mapper'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'dcaegen2-services-mapper-settings'
 
 - project: