Merge "Cleanup old java11 related jobs from ci-management repo"

diff --git a/jjb/cps/cps-csit.yaml b/jjb/cps/cps-csit.yaml
index 4682f89..118b94d 100644 (file)
--- a/jjb/cps/cps-csit.yaml
+++ b/jjb/cps/cps-csit.yaml
@@ -17,8 +17,8 @@
     # project name in gerrit
     project: "cps"
     stream:
-      - "kohn":
-          branch: "kohn"
+      - "london":
+          branch: "london"
     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 beeaa89..c9238f6 100644 (file)
--- a/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml
+++ b/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml
@@ -16,8 +16,8 @@
     # project name in gerrit
     project: "cps/ncmp-dmi-plugin"
     stream:
-      - "kohn":
-          branch: "kohn"
+      - "london":
+          branch: "london"
     mvn-settings: "cps-ncmp-dmi-plugin-settings"
     robot-options: ""
 - project:

diff --git a/jjb/cps/cps-ncmp-dmi-plugin.yaml b/jjb/cps/cps-ncmp-dmi-plugin.yaml
index e658a49..2895b2a 100644 (file)
--- a/jjb/cps/cps-ncmp-dmi-plugin.yaml
+++ b/jjb/cps/cps-ncmp-dmi-plugin.yaml
@@ -34,9 +34,6 @@
     stream:
       - "master":
           branch: master
-      - "london":
-          branch: "london"
-          cron: ""
       - "montreal":
           branch: "montreal"
           cron: ""
@@ -72,8 +69,8 @@
       - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
     stream:
-      - "kohn":
-          branch: "kohn"
+      - "london":
+          branch: "london"
           cron: ""
     mvn-settings: cps-ncmp-dmi-plugin-settings
     files: "**"

diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml
index cdd1004..a7c3855 100644 (file)
--- a/jjb/cps/cps.yaml
+++ b/jjb/cps/cps.yaml
@@ -46,9 +46,6 @@
       - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
     stream:
-      - "kohn":
-          branch: "kohn"
-          cron: ""
       - "london":
           branch: "london"
           cron: ""