[DCAE] Add istanbul branch for CLM jobs
Change-Id: I833d0ebe8e0c55241a913e71cc0c5140e0e81a80
Signed-off-by: vv770d <vv770d@att.com>
Issue-ID: DCAEGEN2-3060
Signed-off-by: vv770d <vv770d@att.com>
diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
index e5ae144..6623edd 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
@@ -67,7 +67,11 @@
project: dcaegen2/analytics/tca-gen2
build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-analytics-tca-gen2'
- branch: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'istanbul':
+ branch: 'istanbul'
mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
mvn-version: 'mvn35'
maven-version: 'mvn35'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
index 4374d47..59e4bf7 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
@@ -63,7 +63,11 @@
project: dcaegen2/collectors/datafile
build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-collectors-datafile'
- branch: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'istanbul':
+ branch: 'istanbul'
java-version: openjdk11
mvn-settings: 'dcaegen2-collectors-datafile-settings'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index 0b3c6cb..5778cb5 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -64,7 +64,11 @@
nexus-iq-namespace: 'onap-'
project: dcaegen2/collectors/hv-ves
project-name: 'dcaegen2-collectors-hv-ves'
- branch: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'istanbul':
+ branch: 'istanbul'
build-node: ubuntu1804-docker-8c-8g
mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
index 955997b..31c2a67 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
@@ -64,7 +64,11 @@
project: dcaegen2/collectors/restconf
build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-collectors-restconf'
- branch: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'istanbul':
+ branch: 'istanbul'
mvn-settings: 'dcaegen2-collectors-restconf-settings'
- project:
diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index bfd9e25..4a4f21f 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -64,7 +64,11 @@
project: dcaegen2/collectors/ves
build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-collectors-ves'
- branch: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'istanbul':
+ branch: 'istanbul'
mvn-settings: 'dcaegen2-collectors-ves-settings'
- project:
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
index 255817d..fc8539c 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
@@ -33,5 +33,9 @@
project: dcaegen2/platform
build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-platform-mod-designtool'
- branch: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'istanbul':
+ branch: 'istanbul'
mvn-settings: 'dcaegen2-platform-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
index 3aeca04..b5af558 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
@@ -52,6 +52,10 @@
project: 'dcaegen2/platform'
project-name: dcaegen2-platform-mod-genprocessor-clm
mvn-params: '-f mod/genprocessor/pom.xml'
- branch: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'istanbul':
+ branch: 'istanbul'
mvn-settings: 'dcaegen2-platform-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
index 08b17c2..299c042 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
@@ -55,5 +55,9 @@
project: 'dcaegen2/platform'
project-name: dcaegen2-platform-mod-runtimeapi-clm
mvn-params: '-f mod/runtimeapi/pom.xml'
- branch: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'istanbul':
+ branch: 'istanbul'
mvn-settings: 'dcaegen2-platform-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml
index 5533c9e..6840746 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml
@@ -63,5 +63,9 @@
project: 'dcaegen2/platform'
project-name: dcaegen2-platform-mod2-helm-generator
mvn-params: '-f mod2/helm-generator/pom.xml'
- branch: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'istanbul':
+ branch: 'istanbul'
mvn-settings: 'dcaegen2-platform-settings'
diff --git a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
index 635ebcc..3308f7e 100644
--- a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
@@ -85,5 +85,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'
diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
index f62e3f0..31a6bc5 100644
--- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
@@ -61,7 +61,11 @@
project: dcaegen2/services/mapper
build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-services-mapper'
- branch: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'istanbul':
+ branch: 'istanbul'
mvn-settings: 'dcaegen2-services-mapper-settings'
- project:
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
old mode 100755
new mode 100644
index 586ee99..409e5f8
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -63,7 +63,11 @@
project: dcaegen2/services/pm-mapper
build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-services-pm-mapper'
- branch: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'istanbul':
+ branch: 'istanbul'
java-version: openjdk11
mvn-settings: 'dcaegen2-services-pm-mapper-settings'
diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml
index 88824ad..0135244 100644
--- a/jjb/dcaegen2/dcaegen2-services-prh.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml
@@ -60,7 +60,11 @@
build-node: ubuntu1804-docker-8c-8g
java-version: openjdk11
project-name: 'dcaegen2-services-prh'
- branch: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'istanbul':
+ branch: 'istanbul'
mvn-settings: 'dcaegen2-services-prh-settings'
- project:
diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
index 6d16986..7f43758 100644
--- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
@@ -71,7 +71,11 @@
project: dcaegen2/services/sdk
build-node: centos7-docker-8c-8g
project-name: 'dcaegen2-services-sdk'
- branch: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'istanbul':
+ branch: 'istanbul'
mvn-settings: 'dcaegen2-services-sdk-settings'
- project:
diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
index aa3066b..d6956ca 100644
--- a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
@@ -87,5 +87,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'
diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
index 8fe300e..d6b9c76 100644
--- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
@@ -61,7 +61,11 @@
project: dcaegen2/services/son-handler
build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-services-son-handler'
- branch: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'istanbul':
+ branch: 'istanbul'
mvn-settings: 'dcaegen2-services-son-handler-settings'
- project: