[DCAE] Fix verify jobs trigger for KPI-ms

[ci-management.git] / jjb / dcaegen2 / dcaegen2-services-kpi-computation-ms.yaml

diff --git a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
index 635ebcc..b6eefe3 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
@@ -1,27 +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'
-      - 'honolulu':
-          branch: 'honolulu'
       - '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: ANT
+        pattern: 'components/kpi-computation-ms/**'
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
     maven-deploy-properties: |
       deployAtEnd=true
 
@@ -32,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'
@@ -51,6 +57,9 @@
     mvn-settings: 'dcaegen2-services-settings'
     files: '**'
     archive-artifacts: ''
+    gerrit_trigger_file_paths:
+      - compare-type: ANT
+        pattern: 'components/kpi-computation-ms/**'
     build-node: 'ubuntu1804-docker-8c-8g'
     maven-deploy-properties: |
       deployAtEnd=true
@@ -85,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'