[DCAE] Jobs updated to include istanbul branch
Change-Id: Id8242402bf6165962ba7f851f77a593a2794dcf7
Signed-off-by: vv770d <vv770d@att.com>
Issue-ID: DCAEGEN2-2918
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 4fbd716..e5ae144 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
@@ -23,8 +23,8 @@
stream:
- 'master':
branch: 'master'
- - 'guilin':
- branch: 'guilin'
+ - 'istanbul':
+ branch: 'istanbul'
- 'honolulu':
branch: 'honolulu'
java-version: openjdk11
diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
index d0ef104..4374d47 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
@@ -6,8 +6,8 @@
stream:
- 'master':
branch: 'master'
- - 'guilin':
- branch: 'guilin'
+ - 'istanbul':
+ branch: 'istanbul'
- 'honolulu':
branch: 'honolulu'
java-version: openjdk11
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index db6d27d..0b3c6cb 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -6,8 +6,8 @@
stream:
- 'master':
branch: 'master'
- - 'guilin':
- branch: 'guilin'
+ - 'istanbul':
+ branch: 'istanbul'
- 'honolulu':
branch: 'honolulu'
# apply to all jobs
diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
index 141d09b..955997b 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
@@ -22,8 +22,8 @@
stream:
- 'master':
branch: 'master'
- - 'guilin':
- branch: 'guilin'
+ - 'istanbul':
+ branch: 'istanbul'
- 'honolulu':
branch: 'honolulu'
mvn-settings: 'dcaegen2-collectors-restconf-settings'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index a29412d..06c1505 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -8,8 +8,8 @@
stream:
- 'master':
branch: 'master'
- - 'guilin':
- branch: 'guilin'
+ - 'istanbul':
+ branch: 'istanbul'
- 'honolulu':
branch: 'honolulu'
build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index 0897793..bfd9e25 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -22,12 +22,10 @@
stream:
- 'master':
branch: 'master'
- - 'guilin':
- branch: 'guilin'
+ - 'istanbul':
+ branch: 'istanbul'
- 'honolulu':
branch: 'honolulu'
- - 'ves_synchronous':
- branch: 'ves_synchronous'
mvn-settings: 'dcaegen2-collectors-ves-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml
index 200cf55..1421ef0 100644
--- a/jjb/dcaegen2/dcaegen2-deployments.yaml
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -12,8 +12,8 @@
stream:
- 'master':
branch: 'master'
- - 'guilin':
- branch: 'guilin'
+ - 'istanbul':
+ branch: 'istanbul'
- 'honolulu':
branch: 'honolulu'
mvn-settings: 'dcaegen2-deployments-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
index 70c49f4..a36be28 100644
--- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml
@@ -12,8 +12,8 @@
stream:
- 'master':
branch: 'master'
- - 'guilin':
- branch: 'guilin'
+ - 'istanbul':
+ branch: 'istanbul'
- 'honolulu':
branch: 'honolulu'
mvn-settings: 'dcaegen2-platform-blueprints-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
index a0e3d32..ff838dd 100644
--- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
@@ -30,8 +30,8 @@
stream:
- master:
branch: master
- - guilin:
- branch: guilin
+ - istanbul:
+ branch: istanbul
- honolulu:
branch: honolulu
diff --git a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
index fbf33b4..369e6f4 100644
--- a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
@@ -95,8 +95,8 @@
stream:
- master:
branch: master
- - guilin:
- branch: guilin
+ - istanbul:
+ branch: istanbul
- honolulu:
branch: honolulu
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
index b3f2a2f..e50fc88 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
@@ -22,8 +22,8 @@
stream:
- 'master':
branch: 'master'
- - 'guilin':
- branch: 'guilin'
+ - 'istanbul':
+ branch: 'istanbul'
- 'honolulu':
branch: 'honolulu'
java-version: openjdk11
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
index 59eaa94..255817d 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
@@ -15,8 +15,8 @@
stream:
- 'master':
branch: 'master'
- - 'guilin':
- branch: 'guilin'
+ - 'istanbul':
+ branch: 'istanbul'
- 'honolulu':
branch: 'honolulu'
mvn-settings: dcaegen2-platform-settings
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
index f2858c7..3aeca04 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
@@ -15,10 +15,10 @@
stream:
- 'master':
branch: 'master'
- - 'guilin':
- branch: 'guilin'
- 'honolulu':
branch: 'honolulu'
+ - 'istanbul':
+ branch: 'istanbul'
mvn-settings: dcaegen2-platform-settings
files: '**'
archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
index db490f7..08b17c2 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
@@ -15,10 +15,10 @@
stream:
- 'master':
branch: 'master'
- - 'guilin':
- branch: 'guilin'
- 'honolulu':
branch: 'honolulu'
+ - 'istanbul':
+ branch: 'istanbul'
java-version: openjdk11
mvn-settings: dcaegen2-platform-settings
files: '**'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml
index fe6aa15..66378f8 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml
@@ -16,9 +16,6 @@
- 'master':
branch: 'master'
java-version: openjdk11
- - 'honolulu':
- branch: 'honolulu'
- java-version: openjdk11
mvn-settings: dcaegen2-platform-settings
maven-version: 'mvn35'
maven-deploy-properties: |
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml
index c9b4b85..219a4d9 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml
@@ -16,9 +16,6 @@
- 'master':
branch: 'master'
java-version: openjdk11
- - 'honolulu':
- branch: 'honolulu'
- java-version: openjdk11
mvn-settings: dcaegen2-platform-settings
maven-version: 'mvn35'
maven-deploy-properties: |
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml
index 37dfd4d..274d7e5 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml
@@ -16,9 +16,6 @@
- 'master':
branch: 'master'
java-version: openjdk11
- - 'honolulu':
- branch: 'honolulu'
- java-version: openjdk11
mvn-settings: dcaegen2-platform-settings
maven-version: 'mvn35'
maven-deploy-properties: |
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml
index fd80f8b..3d8ea65 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml
@@ -16,9 +16,6 @@
- 'master':
branch: 'master'
java-version: openjdk11
- - 'honolulu':
- branch: 'honolulu'
- java-version: openjdk11
mvn-settings: dcaegen2-platform-settings
maven-version: 'mvn35'
maven-deploy-properties: |
diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
index 50f3ffc..74dc768 100644
--- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
@@ -12,11 +12,12 @@
- 'master':
branch: 'master'
python-version: python3
- - 'guilin':
- branch: 'guilin'
- 'honolulu':
branch: 'honolulu'
python-version: python3
+ - 'istanbul':
+ branch: 'istanbul'
+ python-version: python3
mvn-settings: 'dcaegen2-platform-plugins-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
index 77a9468..cb614e5 100644
--- a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
@@ -24,6 +24,8 @@
branch: 'master'
- 'honolulu':
branch: 'honolulu'
+ - 'istanbul':
+ branch: 'istanbul'
mvn-settings: 'dcaegen2-platform-ves-openapi-manager-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
index b336f35..92b0b47 100644
--- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
@@ -14,10 +14,10 @@
stream:
- 'master':
branch: 'master'
- - 'guilin':
- branch: 'guilin'
- 'honolulu':
branch: 'honolulu'
+ - 'istanbul':
+ branch: 'istanbul'
java-version: openjdk11
mvn-settings: 'dcaegen2-services-settings'
maven-version: 'mvn35'
diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index a9efd72..837e17d 100644
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -13,8 +13,8 @@
stream:
- 'master':
branch: 'master'
- - 'guilin':
- branch: 'guilin'
+ - 'istanbul':
+ branch: 'istanbul'
- 'honolulu':
branch: 'honolulu'
java-version: openjdk11
@@ -48,8 +48,8 @@
stream:
- 'master':
branch: 'master'
- - 'guilin':
- branch: 'guilin'
+ - 'istanbul':
+ branch: 'istanbul'
- 'honolulu':
branch: 'honolulu'
java-version: openjdk11
@@ -82,8 +82,8 @@
stream:
- 'master':
branch: 'master'
- - 'guilin':
- branch: 'guilin'
+ - 'istanbul':
+ branch: 'istanbul'
- 'honolulu':
branch: 'honolulu'
java-version: openjdk11
@@ -116,8 +116,8 @@
stream:
- 'master':
branch: 'master'
- - 'guilin':
- branch: 'guilin'
+ - 'istanbul':
+ branch: 'istanbul'
- 'honolulu':
branch: 'honolulu'
java-version: openjdk11
diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
index 97e7768..57f797b 100644
--- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
@@ -106,6 +106,8 @@
branch: master
- honolulu:
branch: honolulu
+ - istanbul:
+ branch: istanbul
views:
- project-view:
project-name: dcaegen2-services-pmsh
diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
index 83511be..82ee025 100644
--- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
@@ -13,10 +13,10 @@
stream:
- 'master':
branch: 'master'
- - 'guilin':
- branch: 'guilin'
- 'honolulu':
branch: 'honolulu'
+ - 'istanbul':
+ branch: 'istanbul'
mvn-settings: 'dcaegen2-services-heartbeat-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
index d42b2cf..635ebcc 100644
--- a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
@@ -15,6 +15,8 @@
branch: 'master'
- 'honolulu':
branch: 'honolulu'
+ - 'istanbul':
+ branch: 'istanbul'
java-version: openjdk11
mvn-settings: 'dcaegen2-services-settings'
files: '**'
diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
index f10064d..f62e3f0 100644
--- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
@@ -22,10 +22,10 @@
stream:
- 'master':
branch: 'master'
- - 'guilin':
- branch: 'guilin'
- 'honolulu':
branch: 'honolulu'
+ - 'istanbul':
+ branch: 'istanbul'
mvn-settings: 'dcaegen2-services-mapper-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
index 383f9e8..586ee99 100755
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -6,10 +6,10 @@
stream:
- 'master':
branch: 'master'
- - 'guilin':
- branch: 'guilin'
- 'honolulu':
branch: 'honolulu'
+ - 'istanbul':
+ branch: 'istanbul'
java-version: openjdk11
# apply to all jobs
project: 'dcaegen2/services/pm-mapper'
diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml
index 9ab8eac..88824ad 100644
--- a/jjb/dcaegen2/dcaegen2-services-prh.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml
@@ -20,10 +20,10 @@
stream:
- 'master':
branch: 'master'
- - 'guilin':
- branch: 'guilin'
- 'honolulu':
branch: 'honolulu'
+ - 'istanbul':
+ branch: 'istanbul'
java-version: openjdk11
mvn-settings: 'dcaegen2-services-prh-settings'
files: '**'
diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
index 0c686ef..6d16986 100644
--- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
@@ -16,10 +16,10 @@
stream:
- 'master':
branch: 'master'
- - 'guilin':
- branch: 'guilin'
- 'honolulu':
branch: 'honolulu'
+ - 'istanbul':
+ branch: 'istanbul'
java-version: openjdk11
mvn-settings: 'dcaegen2-services-sdk-settings'
files: '**'
diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
index 71374e2..aa3066b 100644
--- a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
@@ -13,10 +13,10 @@
stream:
- 'master':
branch: 'master'
- - 'guilin':
- branch: 'guilin'
- 'honolulu':
branch: 'honolulu'
+ - 'istanbul':
+ branch: 'istanbul'
java-version: openjdk11
mvn-settings: 'dcaegen2-services-settings'
files: '**'
diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
index a13da55..8fe300e 100644
--- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
@@ -21,10 +21,10 @@
stream:
- 'master':
branch: 'master'
- - 'guilin':
- branch: 'guilin'
- 'honolulu':
branch: 'honolulu'
+ - 'istanbul':
+ branch: 'istanbul'
java-version: openjdk11
mvn-settings: 'dcaegen2-services-son-handler-settings'
files: '**'
diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index 73289f8..624f74d 100644
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -13,10 +13,10 @@
stream:
- 'master':
branch: 'master'
- - 'guilin':
- branch: 'guilin'
- 'honolulu':
branch: 'honolulu'
+ - 'istanbul':
+ branch: 'istanbul'
mvn-settings: 'dcaegen2-utils-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties
diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml
index 6cc6bf7..cf65da2 100644
--- a/jjb/dcaegen2/dcaegen2.yaml
+++ b/jjb/dcaegen2/dcaegen2.yaml
@@ -17,12 +17,10 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
- - 'guilin':
- branch: 'guilin'
- 'honolulu':
branch: 'honolulu'
+ - 'istanbul':
+ branch: 'istanbul'
mvn-settings: 'dcaegen2-settings'
# due to a strange macro / variable translation problem this needs
# to be passed as a string block to properly get the properties