X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-collectors-datafile.yaml;h=3bac9d475fd3ca519d1e3505434cd4a4226885a0;hb=0a2909d6b644168de0154f96af8f2a3e70bd6be7;hp=d0ef104cd84acd49a6deb39b6759e5ca3eeace92;hpb=b0363f629b5933b181889a72f4144a12f461a05e;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
index d0ef104cd..3bac9d475 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
@@ -6,10 +6,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     # apply to all jobs
     project: 'dcaegen2/collectors/datafile'
@@ -19,9 +19,17 @@
       deployAtEnd=true
     archive-artifacts: ''
     build-node: ubuntu1804-docker-8c-8g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
     jobs:
+      - gerrit-maven-verify:
+          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
+          mvn-goals: 'clean install'
+      - gerrit-maven-merge:
+          mvn-goals: 'clean deploy'
       - gerrit-maven-stage:
           sign-artifacts: true
+          sbom-generator: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
@@ -31,10 +39,6 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-goals: 'clean package docker:build -DpushImageTag'
-      - '{project-name}-{stream}-verify-java':
-          mvn-goals: 'clean install'
-      - '{project-name}-{stream}-merge-java':
-          mvn-goals: 'clean deploy'
 
 - project:
     name: dcaegen2-collectors-datafile-sonar
@@ -63,7 +67,11 @@
     project: dcaegen2/collectors/datafile
     build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-collectors-datafile'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-settings: 'dcaegen2-collectors-datafile-settings'