X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-services-kpi-computation-ms.yaml;h=65f6ffa6c5b6591ce19ceb1c7104464d28721b9b;hb=e46f9aa926bb423cb983cfdcbd9d029cd69f5301;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..65f6ffa6c 100644
--- a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
@@ -1,53 +1,64 @@
 ---
 - project:
-    name: dcaegen2-services-kpi-computation-ms-verify
-    project-name: 'dcaegen2-services'
-    project: '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'
+      - "master":
+          branch: "master"
+      - "london":
+          branch: "london"
     java-version: openjdk11
-    mvn-settings: 'dcaegen2-services-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
+    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
 
 - project:
     name: dcaegen2-services-kpi-computation-ms-release
-    project-name: 'dcaegen2-services-kpi-computation-ms'
-    project: 'dcaegen2/services'
+    project-name: "dcaegen2-services-kpi-computation-ms"
+    project: "dcaegen2/services"
     jobs:
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-docker-8c-8g
+          sbom-generator: true
+          sbom-path: "components/kpi-computation-ms/"
+          build-node: centos8-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/**'
+          mvn-pom: "components/kpi-computation-ms/pom.xml"
+          mvn-params: "-f components/kpi-computation-ms/pom.xml"
       - 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/**'
+          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"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     java-version: openjdk11
-    mvn-settings: 'dcaegen2-services-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1804-docker-8c-8g'
+    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
 
@@ -57,29 +68,29 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
     build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/services'
-    project-name: 'dcaegen2-services-kpi-computation-ms'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-services-settings'
-    mvn-goals: 'clean install'
-    mvn-params: '-f components/kpi-computation-ms/pom.xml'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "dcaegen2/services"
+    project-name: "dcaegen2-services-kpi-computation-ms"
+    branch: "master"
+    mvn-settings: "dcaegen2-services-settings"
+    mvn-goals: "clean install"
+    mvn-params: "-f components/kpi-computation-ms/pom.xml"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: dcaegen2-services-kpi-computation-ms-clm
     java-version: openjdk11
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: dcaegen2/services
     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'
-    mvn-settings: 'dcaegen2-services-settings'
+    project-name: "dcaegen2-services-kpi-computation-ms-clm"
+    mvn-params: "-f components/kpi-computation-ms/pom.xml"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "dcaegen2-services-settings"