X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-collectors-hv-ves.yaml;h=c071fb6941408b51374dcedd7217a4c68af62974;hb=61a0f59c466bf12a84b8b2b5d0031589bcdadc0d;hp=d6f7b87dffaf52971377f25d1fa276587eac759c;hpb=880f9777f0d6616a3a1747dd3457dbb2fb109354;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index d6f7b87df..c071fb694 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -6,29 +6,35 @@
     stream:
       - 'master':
           branch: 'master'
-          java-version: openjdk11
+      - 'jakarta':
+          branch: 'jakarta'
     # apply to all jobs
+    java-version: openjdk11
     project: 'dcaegen2/collectors/hv-ves'
     mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
     files: '**'
     maven-deploy-properties: |
       deployAtEnd=true
     archive-artifacts: 'hv-collector-coverage/target/site/jacoco-aggregate,**/target/reports/detekt-report.html'
-    build-node: ubuntu1804-docker-8c-8g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
+    build-node: ubuntu2004-docker-8c-8g
     jobs:
-      - '{project-name}-{stream}-verify-java':
+      - gerrit-maven-verify:
+          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
           mvn-goals: 'clean install'
-      - '{project-name}-{stream}-merge-java':
+      - gerrit-maven-merge:
           mvn-goals: 'clean deploy'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
+          sbom-generator: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
           mvn-goals: 'clean deploy -Ddocker.skip'
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
+          build-node: ubuntu2004-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
@@ -44,7 +50,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1804-docker-8c-8g
+    build-node: ubuntu2004-docker-8c-8g
     project: 'dcaegen2/collectors/hv-ves'
     project-name: 'dcaegen2-collectors-hv-ves'
     branch: 'master'
@@ -60,8 +66,10 @@
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/collectors/hv-ves
     project-name: 'dcaegen2-collectors-hv-ves'
-    branch: 'master'
-    build-node: ubuntu1804-docker-8c-8g
+    stream:
+      - 'master':
+          branch: 'master'
+    build-node: ubuntu2004-docker-8c-8g
     mvn-settings: 'dcaegen2-collectors-hv-ves-settings'