X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-collectors-ves.yaml;h=1e551bfd5656579492169d587940b4270032127e;hb=6633c8385873029713b06369e04694e07e86e607;hp=d507433d899808980a2ac41680d8f9bb10b995f6;hpb=6a25a74f62c1dcfa68253f416046f144bcec87a3;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index d507433d8..1e551bfd5 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -4,14 +4,18 @@
     project-name: 'dcaegen2-collectors-ves'
     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
+      # - '{project-name}-{stream}-verify-java'
+      # - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-docker-8c-8g
+          sign-artifacts: false
+          sbom-generator: true
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-goals: 'clean package docker:build -DpushImageTag'
@@ -22,6 +26,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'dcaegen2-collectors-ves-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
@@ -30,15 +36,23 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
+    mvn-snapshot-id: 'ecomp-snapshots'
+    mvn-version: 'mvn36'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: dcaegen2-collectors-ves-sonar
     java-version: openjdk11
     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-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/collectors/ves'
     project-name: 'dcaegen2-collectors-ves'
     branch: 'master'
@@ -48,13 +62,16 @@
 
 - project:
     name: dcaegen2-collectors-ves-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/collectors/ves
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-collectors-ves'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
     mvn-settings: 'dcaegen2-collectors-ves-settings'
 
 - project: