[DCAE] Add Kohn branch and cleanup older branches
Remove jakarta branch with exception of dcaegen2 (doc) repo.
Change-Id: I219f232188f0cfcb9203f27ab236cd14d4ac6cc6
Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
Issue-ID: DCAEGEN2-3236
Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
index 4599e94..54a2942 100644
--- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml
@@ -25,8 +25,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
java-version: openjdk11
mvn-settings: 'dcaegen2-analytics-tca-gen2-settings'
mvn-version: 'mvn35'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
index 510befe..4a62b4d 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
@@ -6,8 +6,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
java-version: openjdk11
# apply to all jobs
project: 'dcaegen2/collectors/datafile'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index bef9324..c7e79bd 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'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
# apply to all jobs
java-version: openjdk11
project: 'dcaegen2/collectors/hv-ves'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
index 54e9b3f..25814ac 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
@@ -23,8 +23,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
mvn-settings: 'dcaegen2-collectors-restconf-settings'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index 911be77..8442817 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -8,8 +8,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
build-node: ubuntu1804-docker-8c-8g
mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
jobs:
diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index 1e551bf..cf39afe 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -26,8 +26,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
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 b9af660..b034846 100644
--- a/jjb/dcaegen2/dcaegen2-deployments.yaml
+++ b/jjb/dcaegen2/dcaegen2-deployments.yaml
@@ -14,10 +14,8 @@
stream:
- 'master':
branch: 'master'
- - 'istanbul':
- branch: 'istanbul'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
mvn-settings: 'dcaegen2-deployments-settings'
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
diff --git a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
index 7adbfdd..bb70341 100644
--- a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
@@ -96,8 +96,8 @@
stream:
- master:
branch: master
- - jakarta:
- branch: jakarta
+ - kohn:
+ branch: kohn
views:
- project-view:
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
index 3d43a02..0920ead 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
@@ -18,8 +18,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
mvn-settings: dcaegen2-platform-settings
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
index bbc237f..a47fe52 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
@@ -18,8 +18,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
mvn-settings: dcaegen2-platform-settings
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
index 7de568b..d458fb7 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
@@ -18,8 +18,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
java-version: openjdk11
mvn-settings: dcaegen2-platform-settings
gerrit_trigger_file_paths:
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml
index 57b3ed5..bff0e01 100644
--- a/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml
@@ -19,8 +19,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
java-version: openjdk11
mvn-settings: dcaegen2-platform-settings
gerrit_trigger_file_paths:
diff --git a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
index 65dc423..6ca3f3d 100644
--- a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml
@@ -24,8 +24,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
mvn-settings: 'dcaegen2-platform-ves-openapi-manager-settings'
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index 691d54f..f843ba6 100644
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -10,8 +10,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
java-version: openjdk11
maven-version: 'mvn35'
mvn-settings: 'dcaegen2-services-settings'
@@ -51,8 +51,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
java-version: openjdk11
gerrit_trigger_file_paths:
- compare-type: ANT
@@ -86,8 +86,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
java-version: openjdk11
gerrit_trigger_file_paths:
- compare-type: ANT
@@ -121,8 +121,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
java-version: openjdk11
mvn-settings: 'dcaegen2-services-settings'
maven-deploy-properties: |
diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml
index 6947e12..6cd4efa 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: jakarta
- branch: jakarta
+ stream: kohn
+ branch: kohn
cron: ''
- gerrit-whitesource-scan:
build-timeout: 120
@@ -108,8 +108,8 @@
stream:
- master:
branch: master
- - jakarta:
- branch: jakarta
+ - kohn:
+ branch: kohn
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 7ac2918..f4a5f11 100644
--- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
@@ -12,8 +12,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
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 103e77d..c8ec262 100644
--- a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
@@ -10,8 +10,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
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 b0d6470..eed6c2a 100644
--- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml
@@ -24,8 +24,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
mvn-settings: 'dcaegen2-services-mapper-settings'
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
index d42888b..f78c82b 100644
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -6,8 +6,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
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 8efc860..9c22491 100644
--- a/jjb/dcaegen2/dcaegen2-services-prh.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml
@@ -22,8 +22,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
java-version: openjdk11
mvn-settings: 'dcaegen2-services-prh-settings'
mvn-snapshot-id: 'ecomp-snapshots'
diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
index e381d8b..f31a6b9 100644
--- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
@@ -18,8 +18,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
java-version: openjdk11
mvn-settings: 'dcaegen2-services-sdk-settings'
mvn-snapshot-id: 'ecomp-snapshots'
diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
index 5023f77..ae922dc 100644
--- a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
@@ -10,8 +10,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
java-version: openjdk11
mvn-settings: 'dcaegen2-services-settings'
container-public-registry: 'nexus3.onap.org:10001'
diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
index 4f751c5..14ebeb3 100644
--- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml
@@ -22,8 +22,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
java-version: openjdk11
mvn-settings: 'dcaegen2-services-son-handler-settings'
mvn-snapshot-id: 'ecomp-snapshots'
diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index 4cecd41..f8275af 100644
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -14,8 +14,8 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ - 'kohn':
+ branch: 'kohn'
mvn-settings: 'dcaegen2-utils-settings'
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml
index e47a145..e2d70f2 100644
--- a/jjb/dcaegen2/dcaegen2.yaml
+++ b/jjb/dcaegen2/dcaegen2.yaml
@@ -17,6 +17,8 @@
stream:
- 'master':
branch: 'master'
+ - 'kohn':
+ branch: 'kohn'
- 'jakarta':
branch: 'jakarta'
mvn-settings: 'dcaegen2-settings'