X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-collectors-datafile.yaml;h=510befec25f30b710c4b1c0ceb0df0e98b0cbabd;hb=de7d1a2d74b26314f79f5b74550ebe01487bb5c0;hp=3def2f3fc19936099b22c3e1d4bf0f9365f2ef14;hpb=f3d229258a970b77180ffdb86266ebd7804ad0e0;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
index 3def2f3fc..510befec2 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
@@ -6,8 +6,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
       - 'jakarta':
           branch: 'jakarta'
     java-version: openjdk11
@@ -19,9 +17,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 +37,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
@@ -66,8 +68,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
     java-version: openjdk11
     mvn-settings: 'dcaegen2-collectors-datafile-settings'