From 15eb49f29679fb9cf077bf7e7d5a91ce09190725 Mon Sep 17 00:00:00 2001 From: vv770d Date: Thu, 1 Oct 2020 20:25:48 +0000 Subject: [DCAE] add ci jobs for guilin branched components Change-Id: Ib2e5455886f31ec4d41ee8f2b8dd876b643f25f5 Signed-off-by: vv770d Issue-ID: DCAEGEN2-2436 Signed-off-by: vv770d --- jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml | 6 ++--- jjb/dcaegen2/dcaegen2-collectors-datafile.yaml | 6 ++--- jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml | 7 +++--- jjb/dcaegen2/dcaegen2-collectors-restconf.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-collectors-ves.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-deployments.yaml | 6 ++--- jjb/dcaegen2/dcaegen2-platform-blueprints.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-platform-configbinding.yaml | 4 ++-- .../dcaegen2-platform-deployment-handler.yaml | 4 ++-- ...caegen2-platform-docker-python-subprojects.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml | 6 ++--- .../dcaegen2-platform-mod-bpgenerator.yaml | 6 ++--- jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml | 4 ++-- .../dcaegen2-platform-mod-genprocessor.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml | 6 ++--- jjb/dcaegen2/dcaegen2-platform-plugins.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml | 4 ++-- .../dcaegen2-platform-servicechange-handler.yaml | 6 ++--- .../dcaegen2-services-bbs-eventprocessor-java.yaml | 7 +++--- .../dcaegen2-services-datalake-handler.yaml | 26 +++++++++++----------- ...caegen2-services-docker-python-subprojects.yaml | 8 +++---- jjb/dcaegen2/dcaegen2-services-heartbeat.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-services-mapper.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml | 3 +-- jjb/dcaegen2/dcaegen2-services-prh.yaml | 7 +++--- jjb/dcaegen2/dcaegen2-services-sdk.yaml | 7 +++--- .../dcaegen2-services-slice-analysis-ms.yaml | 8 +++++-- jjb/dcaegen2/dcaegen2-services-son-handler.yaml | 6 ++--- jjb/dcaegen2/dcaegen2-utils.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml | 2 -- jjb/dcaegen2/dcaegen2.yaml | 2 ++ 32 files changed, 89 insertions(+), 92 deletions(-) diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index 6d3327f90..f43e01056 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml @@ -6,9 +6,9 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 # apply to all jobs project: 'dcaegen2/analytics/tca-gen2' mvn-settings: 'dcaegen2-analytics-tca-gen2-settings' diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml index f1af9752b..c2584c0c5 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml @@ -6,9 +6,9 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 # apply to all jobs project: 'dcaegen2/collectors/datafile' 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 3ab5a7401..0c682f7df 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml @@ -6,11 +6,10 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 - - 'frankfurt': - branch: 'frankfurt' - java-version: openjdk11 + - 'guilin': + branch: 'guilin' # apply to all jobs + java-version: openjdk11 project: 'dcaegen2/collectors/hv-ves' mvn-settings: 'dcaegen2-collectors-hv-ves-settings' files: '**' diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml index 860bcbf9b..e9d43865a 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml @@ -22,8 +22,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' mvn-settings: 'dcaegen2-collectors-restconf-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-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index c2d604a97..adf63106b 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -13,8 +13,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' mvn-settings: 'dcaegen2-collectors-snmptrap-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-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index 4586ab144..d1eed5dff 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -22,8 +22,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' 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 c5b80e4e2..988734b65 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -12,10 +12,8 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' mvn-settings: 'dcaegen2-deployments-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-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml index 7d571508b..26bbfb538 100644 --- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml @@ -12,8 +12,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' mvn-settings: 'dcaegen2-platform-blueprints-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-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml index f6859a3b4..c99631a42 100644 --- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml @@ -30,8 +30,8 @@ stream: - master: branch: master - - frankfurt: - branch: frankfurt + - guilin: + branch: guilin - project: name: dcaegen2-platform-configbinding-sonar diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml index 0aaf8c9cc..eeb59e6e3 100644 --- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml @@ -12,8 +12,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' mvn-settings: 'dcaegen2-platform-deployment-handler-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-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml index 1268c50b2..35041828a 100644 --- a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml @@ -98,8 +98,8 @@ stream: - master: branch: master - - frankfurt: - branch: frankfurt + - guilin: + branch: guilin views: - project-view: project-name: dcaegen2-platform-adapter diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml index 69d3ba1a1..b4447b12e 100644 --- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml @@ -21,9 +21,9 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 mvn-settings: 'dcaegen2-platform-inventory-api-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-mod-bpgenerator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml index 0f061b9de..b889459e5 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml @@ -22,9 +22,9 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 mvn-settings: 'dcaegen2-platform-settings' maven-deploy-properties: | deployAtEnd=true diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml index 5a8a62345..837d10041 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' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' mvn-settings: dcaegen2-platform-settings files: '**' archive-artifacts: '' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml index 73ffe09c0..78d88cfd7 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml @@ -15,8 +15,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' 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 29e79c151..389a4f669 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml @@ -15,9 +15,9 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 mvn-settings: dcaegen2-platform-settings files: '**' archive-artifacts: '' diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml index af7d87469..37131463f 100644 --- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml @@ -11,8 +11,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' 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-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml index ea801033c..dfa440bd3 100644 --- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml @@ -9,8 +9,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' build-node: ubuntu1804-docker-8c-8g mvn-settings: 'dcaegen2-platform-policy-handler-settings' subproject: diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml index affa258c4..bbb86e45e 100644 --- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml @@ -21,9 +21,9 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 mvn-settings: 'dcaegen2-platform-servicechange-handler-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 776eea238..536d7815a 100644 --- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml +++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml @@ -14,10 +14,9 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 - - 'frankfurt': - branch: 'frankfurt' - java-version: openjdk11 + - 'guilin': + branch: 'guilin' + java-version: openjdk11 mvn-settings: 'dcaegen2-services-settings' maven-version: 'mvn35' maven-deploy-properties: | diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml index b634404df..0fb443b4b 100644 --- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml @@ -13,9 +13,9 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 mvn-settings: 'dcaegen2-services-settings' maven-deploy-properties: | deployAtEnd=true @@ -45,9 +45,9 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 mvn-settings: 'dcaegen2-services-settings' maven-deploy-properties: | deployAtEnd=true @@ -76,10 +76,10 @@ pattern: 'components/datalake-handler/**' stream: - 'master': - branch: 'master' - java-version: openjdk11 - - 'frankfurt': - branch: 'frankfurt' + branch: 'master' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 mvn-settings: 'dcaegen2-services-settings' maven-deploy-properties: | deployAtEnd=true @@ -109,9 +109,9 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 mvn-settings: 'dcaegen2-services-settings' maven-deploy-properties: | deployAtEnd=true diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml index 3c2c28c43..ab5b27e51 100644 --- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml +++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml @@ -54,8 +54,8 @@ pattern: '{src-dir}/.*' jobs: - gerrit-tox-verify: - stream: master - branch: 'master' + stream: all + branch: '*' - gerrit-docker-verify - gerrit-docker-merge: post_docker_build_script: | @@ -91,8 +91,8 @@ stream: - master: branch: master - - frankfurt: - branch: frankfurt + - guilin: + branch: guilin 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 47fa28b1f..6d43bf79f 100644 --- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml +++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml @@ -13,8 +13,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' 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-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml index ab9bb540e..2a3baa3d8 100644 --- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml @@ -22,8 +22,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' 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 fb0a33445..71c129cc6 100755 --- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml @@ -6,10 +6,9 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 - 'guilin': branch: 'guilin' - java-version: openjdk11 + java-version: openjdk11 # apply to all jobs project: 'dcaegen2/services/pm-mapper' mvn-settings: 'dcaegen2-services-pm-mapper-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml index 051c958a0..fd45ee5fd 100644 --- a/jjb/dcaegen2/dcaegen2-services-prh.yaml +++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml @@ -20,10 +20,9 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 - - 'frankfurt': - branch: 'frankfurt' - java-version: openjdk11 + - 'guilin': + branch: 'guilin' + java-version: openjdk11 mvn-settings: 'dcaegen2-services-prh-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml index d8500b8ca..88a658fed 100644 --- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml +++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml @@ -16,10 +16,9 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 - - 'frankfurt': - branch: 'frankfurt' - java-version: openjdk11 + - 'guilin': + branch: 'guilin' + java-version: openjdk11 mvn-settings: 'dcaegen2-services-sdk-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml index b0d5f99aa..0895a825f 100644 --- a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml +++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml @@ -13,7 +13,9 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 + - 'guilin': + branch: 'guilin' + java-version: openjdk11 mvn-settings: 'dcaegen2-services-settings' files: '**' archive-artifacts: '' @@ -45,7 +47,9 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 + - 'guilin': + branch: 'guilin' + java-version: openjdk11 mvn-settings: 'dcaegen2-services-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml index c400367d9..19e953441 100644 --- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml @@ -21,9 +21,9 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 mvn-settings: 'dcaegen2-services-son-handler-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml index f0f2c748a..2785d5078 100644 --- a/jjb/dcaegen2/dcaegen2-utils.yaml +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -13,8 +13,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' 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-ves-prh-csit.yaml b/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml index f1edafc4e..11f333aef 100644 --- a/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml +++ b/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml @@ -23,8 +23,6 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' functionality: - 'prh-testsuites' trigger_jobs: diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml index 318949a4b..83ad65046 100644 --- a/jjb/dcaegen2/dcaegen2.yaml +++ b/jjb/dcaegen2/dcaegen2.yaml @@ -19,6 +19,8 @@ branch: 'master' - 'frankfurt': branch: 'frankfurt' + - 'guilin': + branch: 'guilin' 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