Merge "Chore: Move to ubuntu2004-builder"
diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
index f0c3634..4599e94 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 3bac9d4..510befe 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 35d4eea..bef9324 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 61e8b02..54e9b3f 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 a253c12..911be77 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 ded870e..1e551bf 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 4f9d426..7adbfdd 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 fcc9ca6..3d43a02 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 61e8034..bbc237f 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 43b6019..7de568b 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 a102bc5..57b3ed5 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 3bdb739..65dc423 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 1c6ca0d..691d54f 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 3f37a13..6947e12 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 9e33b81..7ac2918 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 b6eefe3..103e77d 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 e6bbdbe..b0d6470 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 5a0e814..d42888b 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 08078e8..8efc860 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 7c63d19..10fa2c2 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 212a061..5023f77 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 d2eb8ee..4f751c5 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 61e9ab7..4cecd41 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 46c501e..e47a145 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
diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml
index bccc8ce..20e0f61 100644
--- a/jjb/holmes/holmes-common.yaml
+++ b/jjb/holmes/holmes-common.yaml
@@ -16,6 +16,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
java-version: openjdk11
+ sbom-generator: true
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
java-version: openjdk11
diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml
index 79d9e98..1c49166 100644
--- a/jjb/holmes/holmes-engine-mgt.yaml
+++ b/jjb/holmes/holmes-engine-mgt.yaml
@@ -10,6 +10,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
java-version: openjdk11
+ sbom-generator: true
- '{project-name}-{stream}-docker-java-daily':
mvn-params: '-Dmaven.test.skip=true'
build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml
index e93c94c..1177923 100644
--- a/jjb/holmes/holmes-rule-mgt.yaml
+++ b/jjb/holmes/holmes-rule-mgt.yaml
@@ -10,6 +10,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
java-version: openjdk11
+ sbom-generator: true
- '{project-name}-{stream}-docker-java-daily':
mvn-params: '-Dmaven.test.skip=true'
build-node: ubuntu1804-docker-8c-8g