X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-services-datalake-handler.yaml;h=1c6ca0df2799066e3d2ff166957f2c27be6cb13d;hb=45cf0a980d89b70b0f19ba1736bb6813c5d3d565;hp=25449e87c6af4f31b792c0f0b6a3fe662267b090;hpb=b0363f629b5933b181889a72f4144a12f461a05e;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index 25449e87c..1c6ca0df2 100644
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -4,21 +4,27 @@
     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'
-      - 'guilin':
-          branch: 'guilin'
-      - 'honolulu':
-          branch: 'honolulu'
+      - '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'
+    gerrit_trigger_file_paths:
+      - compare-type: ANT
+        pattern: 'components/datalake-handler/**'
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
     maven-deploy-properties: |
       deployAtEnd=true
     files: '**'
@@ -32,26 +38,29 @@
     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'
           mvn-params: '-f components/datalake-handler/pom.xml'
           version-properties-file: 'components/datalake-handler/version.properties'
-          pattern: 'components/datalake-handler/**'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
           mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/feeder/pom.xml'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
-          pattern: 'components/datalake-handler/**'
     stream:
       - 'master':
          branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
+    gerrit_trigger_file_paths:
+      - compare-type: ANT
+        pattern: 'components/datalake-handler/feeder/**'
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
       deployAtEnd=true
@@ -65,27 +74,30 @@
     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
           mvn-pom: 'components/datalake-handler/pom.xml'
           mvn-params: '-f components/datalake-handler/pom.xml'
           version-properties-file: 'components/datalake-handler/version.properties'
-          pattern: 'components/datalake-handler/**'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
           mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/admin/pom.xml'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
-          pattern: 'components/datalake-handler/**'
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
+    gerrit_trigger_file_paths:
+      - compare-type: ANT
+        pattern: 'components/datalake-handler/admin/**'
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
       deployAtEnd=true
@@ -99,31 +111,34 @@
     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
           mvn-pom: 'components/datalake-handler/pom.xml'
           mvn-params: '-f components/datalake-handler/pom.xml'
           version-properties-file: 'components/datalake-handler/version.properties'
-          pattern: 'components/datalake-handler/**'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
           mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/des/pom.xml'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
-          pattern: 'components/datalake-handler/**'
     stream:
       - 'master':
          branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
       deployAtEnd=true
     files: '**'
+    gerrit_trigger_file_paths:
+      - compare-type: ANT
+        pattern: 'components/datalake-handler/des/**'
     archive-artifacts: ''
     build-node: 'ubuntu1804-docker-8c-8g'