X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-services-slice-analysis-ms.yaml;h=212a06107ae30b54d6b758c4029b498ca3e5c736;hb=78a0e2c46983ac0a0c1f0da85811172cd422aa81;hp=0895a825f905c67e037f9ace2818f51744657fd6;hpb=4d8f6d33b8f7b33cde156ef9d98e3995f0a2b67c;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
index 0895a825f..212a06107 100644
--- a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
@@ -1,22 +1,30 @@
 ---
 - project:
     name: dcaegen2-services-slice-analysis-ms-verify
-    project-name: 'dcaegen2-services'
+    project-name: 'dcaegen2-services-slice-analysis-ms'
     project: 'dcaegen2/services'
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-    subproject:
-      - 'slice-analysis-ms':
-          pom: 'components/slice-analysis-ms/pom.xml'
-          pattern: 'components/slice-analysis-ms/**'
+      - 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'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
     mvn-settings: 'dcaegen2-services-settings'
+    container-public-registry: 'nexus3.onap.org:10001'
+    container-staging-registry: 'nexus3.onap.org:10003'
+    mvn-params: '-f components/slice-analysis-ms/pom.xml'
+    gerrit_trigger_file_paths:
+      - compare-type: ANT
+        pattern: 'components/slice-analysis-ms/**'
+    mvn-snapshot-id: 'ecomp-snapshots'
+    mvn-version: 'mvn36'
+    nexus-snapshot-repo: 'snapshots'
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1804-docker-8c-8g'
@@ -30,29 +38,29 @@
     jobs:
       - gerrit-maven-stage:
           sign-artifacts: true
+          sbom-generator: true
+          sbom-path: 'components/slice-analysis-ms/'
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
           mvn-pom: 'components/slice-analysis-ms/pom.xml'
           mvn-params: '-f components/slice-analysis-ms/pom.xml'
-          pattern: 'components/slice-analysis-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/slice-analysis-ms/pom.xml'
-          pattern: 'components/slice-analysis-ms/**'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
     java-version: openjdk11
     mvn-settings: 'dcaegen2-services-settings'
+    mvn-version: 'mvn36'
     files: '**'
     archive-artifacts: ''
+    gerrit_trigger_file_paths:
+      - compare-type: ANT
+        pattern: 'components/slice-analysis-ms/**'
     build-node: 'ubuntu1804-docker-8c-8g'
     maven-deploy-properties: |
       deployAtEnd=true
@@ -87,5 +95,9 @@
     build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-services-slice-analysis-ms-clm'
     mvn-params: '-f components/slice-analysis-ms/pom.xml'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'dcaegen2-services-settings'