From e85dd3fe953dc850bcf2d90e423f3455541efbb4 Mon Sep 17 00:00:00 2001 From: vv770d Date: Tue, 28 Sep 2021 20:41:48 +0000 Subject: [DCAE] Jobs updated to include istanbul branch Change-Id: Id8242402bf6165962ba7f851f77a593a2794dcf7 Signed-off-by: vv770d Issue-ID: DCAEGEN2-2918 Signed-off-by: vv770d --- jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-collectors-datafile.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-collectors-restconf.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-collectors-ves.yaml | 6 ++---- jjb/dcaegen2/dcaegen2-deployments.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-platform-blueprints.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-platform-configbinding.yaml | 4 ++-- .../dcaegen2-platform-docker-python-subprojects.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml | 3 --- jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml | 3 --- jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml | 3 --- jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml | 3 --- jjb/dcaegen2/dcaegen2-platform-plugins.yaml | 5 +++-- jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml | 2 ++ .../dcaegen2-services-bbs-eventprocessor-java.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml | 16 ++++++++-------- .../dcaegen2-services-docker-python-subprojects.yaml | 2 ++ jjb/dcaegen2/dcaegen2-services-heartbeat.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml | 2 ++ jjb/dcaegen2/dcaegen2-services-mapper.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-services-prh.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-services-sdk.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-services-son-handler.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-utils.yaml | 4 ++-- jjb/dcaegen2/dcaegen2.yaml | 6 ++---- 33 files changed, 65 insertions(+), 74 deletions(-) diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index 4fbd716e8..e5ae14499 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 d0ef104cd..4374d4764 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 db6d27dc5..0b3c6cb66 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 141d09b4a..955997bfb 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 a29412da0..06c1505a3 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 0897793f9..bfd9e2550 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 200cf55e8..1421ef0f0 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 70c49f444..a36be286d 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 a0e3d3247..ff838ddcd 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 fbf33b4f8..369e6f489 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 b3f2a2f50..e50fc887c 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 59eaa948b..255817d21 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 f2858c767..3aeca0442 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 db490f79f..08b17c22b 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 fe6aa1553..66378f8a1 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 c9b4b8552..219a4d915 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 37dfd4d4b..274d7e595 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 fd80f8b93..3d8ea65fd 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 50f3ffc40..74dc768eb 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 77a9468fa..cb614e5e0 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 b336f35c9..92b0b470a 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 a9efd7210..837e17de0 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 97e7768c6..57f797bdf 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 83511be29..82ee02506 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 d42b2cff3..635ebcc69 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 f10064d2b..f62e3f06a 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 383f9e821..586ee99fb 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 9ab8eac07..88824ad75 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 0c686efa9..6d1698655 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 71374e27c..aa3066ba1 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 a13da5539..8fe300ed0 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 73289f8ad..624f74dd1 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 6cc6bf7e5..cf65da2a4 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 -- cgit 1.2.3-korg