[DCAE] Add istanbul branch for CLM jobs

[ci-management.git] / jjb / dcaegen2 / dcaegen2-services-slice-analysis-ms.yaml

diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
index 73f1dff..d6956ca 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
@@ -4,8 +4,8 @@
     project-name: 'dcaegen2-services'
     project: 'dcaegen2/services'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
     subproject:
       - 'slice-analysis-ms':
           pom: 'components/slice-analysis-ms/pom.xml'
@@ -13,7 +13,11 @@
     stream:
       - 'master':
           branch: 'master'
-          java-version: openjdk11
+      - 'honolulu':
+          branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
+    java-version: openjdk11
     mvn-settings: 'dcaegen2-services-settings'
     files: '**'
     archive-artifacts: ''
@@ -23,7 +27,7 @@
 
 - project:
     name: dcaegen2-services-slice-analysis-ms-release
-    project-name: 'dcaegen2-slice-analysis-ms'
+    project-name: 'dcaegen2-services-slice-analysis-ms'
     project: 'dcaegen2/services'
     jobs:
       - gerrit-maven-stage:
@@ -38,13 +42,14 @@
           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'
-          java-version: openjdk11
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
     mvn-settings: 'dcaegen2-services-settings'
     files: '**'
     archive-artifacts: ''
@@ -73,14 +78,18 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
 - project:
-    name: dcaegen2-slice-analysis-ms-clm
+    name: dcaegen2-services-slice-analysis-ms-clm
     java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/services
     build-node: ubuntu1804-docker-8c-8g
-    project-name: 'dcaegen2-slice-analysis-ms-clm'
+    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'