From 01687307d4eff044558db61f1cea625d2040112b Mon Sep 17 00:00:00 2001
From: ToineSiebelink <toine.siebelink@est.tech>
Date: Mon, 17 Oct 2022 14:15:28 +0100
Subject: [PATCH] [CPS] Add jobs for Kohn branch

-Add jobs for Kohn for all CPS repos
-Remove reduntant jobs (Istanbul no longer supported)
-Add and correct jobs for CSIT (was missed during Jakarta update?!)

Issue-ID: CPS-1318
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
Change-Id: I4ee2127276f678011bfb967297a9146be99bee59
---
 jjb/cps/cps-cps-temporal-csit.yaml    | 6 ++++--
 jjb/cps/cps-cps-temporal.yaml         | 6 +++---
 jjb/cps/cps-csit.yaml                 | 8 ++++----
 jjb/cps/cps-ncmp-dmi-plugin-csit.yaml | 6 ++++--
 jjb/cps/cps-ncmp-dmi-plugin.yaml      | 6 +++---
 jjb/cps/cps.yaml                      | 6 +++---
 6 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/jjb/cps/cps-cps-temporal-csit.yaml b/jjb/cps/cps-cps-temporal-csit.yaml
index 83c1cc377..362ef580d 100644
--- a/jjb/cps/cps-cps-temporal-csit.yaml
+++ b/jjb/cps/cps-cps-temporal-csit.yaml
@@ -15,7 +15,9 @@
       stream:
           - 'master':
                 branch: 'master'
-          - 'istanbul':
-                branch: 'istanbul'
+          - 'jakarta':
+                branch: 'jakarta'
+          - 'kohn':
+                branch: 'kohn'
       mvn-settings: 'cps-cps-temporal-settings'
       robot-options: ''
diff --git a/jjb/cps/cps-cps-temporal.yaml b/jjb/cps/cps-cps-temporal.yaml
index 3defa769e..86b26e71f 100644
--- a/jjb/cps/cps-cps-temporal.yaml
+++ b/jjb/cps/cps-cps-temporal.yaml
@@ -39,12 +39,12 @@
     stream:
       - 'master':
           branch: master
-      - 'istanbul':
-          branch: 'istanbul'
-          cron: ''
       - 'jakarta':
           branch: 'jakarta'
           cron: ''
+      - 'kohn':
+          branch: 'kohn'
+          cron: ''
     mvn-settings: cps-cps-temporal-settings
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/cps/cps-csit.yaml b/jjb/cps/cps-csit.yaml
index e55444470..ec61636d5 100644
--- a/jjb/cps/cps-csit.yaml
+++ b/jjb/cps/cps-csit.yaml
@@ -16,10 +16,10 @@
       stream:
           - 'master':
                 branch: 'master'
-          - 'honolulu':
-                branch: 'honolulu'
-          - 'istanbul':
-                branch: 'istanbul'
+          - 'jakarta':
+                branch: 'jakarta'
+          - 'kohn':
+                branch: 'kohn'
       mvn-settings: 'cps-settings'
       robot-options: ''
       branch: 'master'
diff --git a/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml b/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml
index 86ff13c60..e43de258d 100644
--- a/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml
+++ b/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml
@@ -15,7 +15,9 @@
       stream:
           - 'master':
                 branch: 'master'
-          - 'istanbul':
-                branch: 'istanbul'
+          - 'jakarta':
+                branch: 'jakarta'
+          - 'kohn':
+                branch: 'kohn'
       mvn-settings: 'cps-ncmp-dmi-plugin-settings'
       robot-options: ''
diff --git a/jjb/cps/cps-ncmp-dmi-plugin.yaml b/jjb/cps/cps-ncmp-dmi-plugin.yaml
index 163324172..432041fef 100644
--- a/jjb/cps/cps-ncmp-dmi-plugin.yaml
+++ b/jjb/cps/cps-ncmp-dmi-plugin.yaml
@@ -42,12 +42,12 @@
     stream:
       - 'master':
           branch: master
-      - 'istanbul':
-          branch: 'istanbul'
-          cron: ''
       - 'jakarta':
           branch: 'jakarta'
           cron: ''
+      - 'kohn':
+          branch: 'kohn'
+          cron: ''
     mvn-settings: cps-ncmp-dmi-plugin-settings
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml
index 6d7a3b96e..0baf89618 100644
--- a/jjb/cps/cps.yaml
+++ b/jjb/cps/cps.yaml
@@ -55,12 +55,12 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
-          cron: ''
       - 'jakarta':
           branch: 'jakarta'
           cron: ''
+      - 'kohn':
+          branch: 'kohn'
+          cron: ''
     mvn-settings: 'cps-settings'
     files: '**'
     archive-artifacts: ''
-- 
2.16.6