From: Vijay Venkatesh Kumar Date: Wed, 28 Sep 2022 15:47:39 +0000 (+0000) Subject: [DCAE] Remove istanbul branch job X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=6633c8385873029713b06369e04694e07e86e607 [DCAE] Remove istanbul branch job Istanbul out of maintenance + NexusIQ cannot support multiple branches Change-Id: I321604b961aa1b4078328c25c92d2ef072a547ba Signed-off-by: Vijay Venkatesh Kumar Issue-ID: DCAEGEN2-3276 Issue-ID: DCAEGEN2-3236 Signed-off-by: Vijay Venkatesh Kumar --- diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index f0c363411..4599e94d6 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml @@ -25,8 +25,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' java-version: openjdk11 @@ -74,8 +72,6 @@ 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 3bac9d475..510befec2 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml @@ -6,8 +6,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' java-version: openjdk11 @@ -70,8 +68,6 @@ 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 35d4eea3a..bef9324fb 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml @@ -6,8 +6,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' # apply to all jobs @@ -71,8 +69,6 @@ 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 61e8b02d5..54e9b3f81 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml @@ -23,8 +23,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' mvn-snapshot-id: 'ecomp-snapshots' @@ -70,8 +68,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' mvn-settings: 'dcaegen2-collectors-restconf-settings' - project: diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index a253c125e..911be77a3 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -8,8 +8,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index ded870e03..1e551bfd5 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -26,8 +26,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' mvn-settings: 'dcaegen2-collectors-ves-settings' @@ -74,8 +72,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' mvn-settings: 'dcaegen2-collectors-ves-settings' - project: diff --git a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml index 4f9d4268f..7adbfdd48 100644 --- a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml @@ -96,8 +96,6 @@ stream: - master: branch: master - - istanbul: - branch: istanbul - jakarta: branch: jakarta diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml index fcc9ca646..3d43a02ed 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml @@ -18,8 +18,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' mvn-settings: dcaegen2-platform-settings @@ -49,6 +47,4 @@ 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 61e8034f9..bbc237faf 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml @@ -18,8 +18,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' mvn-settings: dcaegen2-platform-settings @@ -68,7 +66,5 @@ 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 43b6019ce..7de568b18 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml @@ -18,8 +18,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' java-version: openjdk11 @@ -71,6 +69,4 @@ 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 a102bc509..57b3ed5b7 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml @@ -72,6 +72,4 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' mvn-settings: 'dcaegen2-platform-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml index 3bdb7393f..65dc423f6 100644 --- a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml @@ -24,8 +24,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' mvn-settings: 'dcaegen2-platform-ves-openapi-manager-settings' @@ -71,8 +69,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' mvn-settings: 'dcaegen2-platform-ves-openapi-manager-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml index 1c6ca0df2..691d54f38 100644 --- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml @@ -10,8 +10,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' java-version: openjdk11 @@ -53,8 +51,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' java-version: openjdk11 @@ -90,8 +86,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' java-version: openjdk11 @@ -127,8 +121,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' java-version: openjdk11 diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml index 3f37a13a1..6947e123f 100644 --- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml +++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml @@ -78,8 +78,8 @@ DNAME={container-snapshot-registry}/{docker-name} docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:$DOCKER_IMAGE_TAG2 docker push $DNAME:$DOCKER_IMAGE_TAG2 - stream: istanbul - branch: istanbul + stream: jakarta + branch: jakarta cron: '' - gerrit-whitesource-scan: build-timeout: 120 @@ -108,8 +108,6 @@ stream: - master: branch: master - - istanbul: - branch: istanbul - jakarta: branch: jakarta views: diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml index 9e33b8113..7ac291829 100644 --- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml +++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml @@ -12,8 +12,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' mvn-settings: 'dcaegen2-services-heartbeat-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml index b6eefe398..103e77dbd 100644 --- a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml +++ b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml @@ -10,8 +10,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' java-version: openjdk11 @@ -97,6 +95,4 @@ 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 e6bbdbeb2..b0d647072 100644 --- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml @@ -24,8 +24,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' mvn-settings: 'dcaegen2-services-mapper-settings' @@ -68,8 +66,6 @@ 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 index 5a0e814a0..d42888b76 100644 --- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml @@ -6,8 +6,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' java-version: openjdk11 @@ -70,8 +68,6 @@ 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 08078e8b3..8efc860c1 100644 --- a/jjb/dcaegen2/dcaegen2-services-prh.yaml +++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml @@ -22,8 +22,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' java-version: openjdk11 @@ -67,8 +65,6 @@ 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 7c63d1945..10fa2c24a 100644 --- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml +++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml @@ -18,8 +18,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' java-version: openjdk11 @@ -78,8 +76,6 @@ 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 212a06107..5023f77e9 100644 --- a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml +++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml @@ -10,8 +10,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' java-version: openjdk11 @@ -98,6 +96,4 @@ 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 d2eb8ee2c..4f751c50e 100644 --- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml @@ -22,8 +22,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' java-version: openjdk11 @@ -67,8 +65,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' mvn-settings: 'dcaegen2-services-son-handler-settings' - project: diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml index 61e9ab727..4cecd41da 100644 --- a/jjb/dcaegen2/dcaegen2-utils.yaml +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -14,8 +14,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' mvn-settings: 'dcaegen2-utils-settings' diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml index 46c501ef6..e47a14594 100644 --- a/jjb/dcaegen2/dcaegen2.yaml +++ b/jjb/dcaegen2/dcaegen2.yaml @@ -19,8 +19,6 @@ branch: 'master' - 'jakarta': branch: 'jakarta' - - '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