[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
diff --git a/jjb/cps/cps-cps-temporal-csit.yaml b/jjb/cps/cps-cps-temporal-csit.yaml
index 83c1cc3..362ef58 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 3defa76..86b26e7 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 e554444..ec61636 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 86ff13c..e43de25 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 1633241..432041f 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 6d7a3b9..0baf896 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: ''