X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-services-datalake-handler.yaml;h=4b35e76955a9b1b0b057405d1947a8eafdb41693;hb=0a2909d6b644168de0154f96af8f2a3e70bd6be7;hp=b634404df9320fa5003acee404a3edd9498146d0;hpb=f4c2c0995bb963f598be10481fb68044796582dc;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index b634404df..4b35e7695 100644
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -1,22 +1,28 @@
 ---
 - project:
-    name: dcaegen2-services-datalake-handler
+    name: dcaegen2-services-datalake-handler-verify-merge
     project: 'dcaegen2/services'
     project-name: 'dcaegen2-services-datalake-handler'
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-    subproject:
-      - 'datalake-handler':
-          pom: 'components/datalake-handler/pom.xml'
-          pattern: 'components/datalake-handler/**'
+      - gerrit-maven-verify:
+          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
+      - gerrit-maven-merge
     stream:
       - 'master':
           branch: 'master'
-          java-version: openjdk11
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
+    java-version: openjdk11
+    maven-version: 'mvn35'
     mvn-settings: 'dcaegen2-services-settings'
+    container-public-registry: 'nexus3.onap.org:10001'
+    container-staging-registry: 'nexus3.onap.org:10003'
+    mvn-params: '-f components/datalake-handler/pom.xml'
+    pattern: 'components/datalake-handler/**'
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
     maven-deploy-properties: |
       deployAtEnd=true
     files: '**'
@@ -30,6 +36,8 @@
     jobs:
       - gerrit-maven-stage:
           sign-artifacts: true
+          sbom-generator: true
+          sbom-path: 'components/datalake-handler/'
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
           mvn-pom: 'components/datalake-handler/pom.xml'
@@ -45,9 +53,11 @@
     stream:
       - 'master':
          branch: 'master'
-         java-version: openjdk11
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
+    java-version: openjdk11
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
       deployAtEnd=true
@@ -61,6 +71,8 @@
     project-name: 'dcaegen2-services-datalake-handler-admin-ui'
     jobs:
       - gerrit-maven-stage:
+          sbom-generator: true
+          sbom-path: 'components/datalake-handler/'
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
@@ -76,10 +88,12 @@
           pattern: 'components/datalake-handler/**'
     stream:
       - 'master':
-         branch: 'master'
-         java-version: openjdk11
-      - 'frankfurt':
-          branch: 'frankfurt'
+          branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
+    java-version: openjdk11
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
       deployAtEnd=true
@@ -93,6 +107,8 @@
     project-name: 'dcaegen2-services-datalake-handler-des'
     jobs:
       - gerrit-maven-stage:
+          sbom-generator: true
+          sbom-path: 'components/datalake-handler/'
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
@@ -109,9 +125,11 @@
     stream:
       - 'master':
          branch: 'master'
-         java-version: openjdk11
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
+    java-version: openjdk11
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
       deployAtEnd=true