X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-services-kpi-computation-ms.yaml;h=33cb078cbfffa28c748e0a5be8ba5a60ee87839e;hb=1d59863f8f6d0719f911a11f40b13d0c34ed3fca;hp=9ab5171f879fffac845f39b498c1b12d0c54aaaa;hpb=bd69a8aa93b0506139b389d6e234e81b04e47aa9;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
index 9ab5171f8..33cb078cb 100644
--- a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
@@ -1,23 +1,33 @@
 ---
 - project:
-    name: dcaegen2-services-kpi-computation-ms-verify
-    project-name: 'dcaegen2-services'
+    name: dcaegen2-services-kpi-computation-ms
+    project-name: 'dcaegen2-services-kpi-computation-ms'
     project: 'dcaegen2/services'
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-    subproject:
-      - 'kpi-computation-ms':
-          pom: 'components/kpi-computation-ms/pom.xml'
-          pattern: 'components/kpi-computation-ms/**'
+      - gerrit-maven-verify:
+          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
+      - gerrit-maven-merge
     stream:
       - 'master':
           branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     mvn-settings: 'dcaegen2-services-settings'
     files: '**'
     archive-artifacts: ''
     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'
+    mvn-params: '-f components/kpi-computation-ms/pom.xml'
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'components/kpi-computation-ms/**'
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
     maven-deploy-properties: |
       deployAtEnd=true
 
@@ -28,18 +38,18 @@
     jobs:
       - gerrit-maven-stage:
           sign-artifacts: true
+          sbom-generator: true
+          sbom-path: 'components/kpi-computation-ms/'
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
           mvn-pom: 'components/kpi-computation-ms/pom.xml'
           mvn-params: '-f components/kpi-computation-ms/pom.xml'
-          pattern: 'components/kpi-computation-ms/**'
       - gerrit-maven-docker-stage:
           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'
           mvn-params: '-f components/kpi-computation-ms/pom.xml'
-          pattern: 'components/kpi-computation-ms/**'
     stream:
       - 'master':
           branch: 'master'
@@ -47,6 +57,9 @@
     mvn-settings: 'dcaegen2-services-settings'
     files: '**'
     archive-artifacts: ''
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'components/kpi-computation-ms/**'
     build-node: 'ubuntu1804-docker-8c-8g'
     maven-deploy-properties: |
       deployAtEnd=true
@@ -81,5 +94,9 @@
     build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-services-kpi-computation-ms-clm'
     mvn-params: '-f components/kpi-computation-ms/pom.xml'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'dcaegen2-services-settings'