14 files changed, 42 insertions, 166 deletions
diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 2ef3a5974..b21f4d94e 100644
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -34,6 +34,8 @@
     stream:
       - "master":
           branch: "master"
+      - "montreal":
+          branch: "montreal"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-apex-pdp-settings"
@@ -69,14 +71,6 @@
 
     project: "policy/apex-pdp"
     stream:
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
     mvn-settings: "policy-apex-pdp-settings"
diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index e467344c8..ffc964ab3 100644
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -28,6 +28,8 @@
     stream:
       - "master":
           branch: "master"
+      - "montreal":
+          branch: "montreal"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-api-settings"
@@ -63,14 +65,6 @@
 
     project: "policy/api"
     stream:
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
     mvn-settings: "policy-api-settings"
diff --git a/jjb/policy/policy-clamp.yaml b/jjb/policy/policy-clamp.yaml
index 3bba839ed..c1dee5706 100644
--- a/jjb/policy/policy-clamp.yaml
+++ b/jjb/policy/policy-clamp.yaml
@@ -28,6 +28,8 @@
     stream:
       - "master":
           branch: "master"
+      - "montreal":
+          branch: "montreal"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-clamp-settings"
@@ -64,14 +66,6 @@
 
     project: "policy/clamp"
     stream:
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
     mvn-settings: "policy-clamp-settings"
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 2076a302a..7a6a1ea7d 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -18,6 +18,8 @@
     stream:
       - "master":
           branch: "master"
+      - "montreal":
+          branch: "montreal"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-common-settings"
@@ -43,14 +45,6 @@
 
     project: "policy/common"
     stream:
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
     mvn-settings: "policy-common-settings"
diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index f5e42e7a9..4cc0ee030 100644
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -10,16 +10,10 @@
     stream:
       - "master":
           branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
+      - "montreal":
+          branch: "montreal"
     functionality:
       - "distribution"
     trigger_jobs:
@@ -37,16 +31,10 @@
     stream:
       - "master":
           branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
+      - "montreal":
+          branch: "montreal"
     functionality:
       - "xacml-pdp"
     trigger_jobs:
@@ -64,16 +52,10 @@
     stream:
       - "master":
           branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
+      - "montreal":
+          branch: "montreal"
     functionality:
       - "drools-applications"
     trigger_jobs:
@@ -91,16 +73,10 @@
     stream:
       - "master":
           branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
+      - "montreal":
+          branch: "montreal"
     functionality:
       - "drools-pdp"
     trigger_jobs:
@@ -118,16 +94,10 @@
     stream:
       - "master":
           branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
+      - "montreal":
+          branch: "montreal"
     functionality:
       - "apex-pdp"
     trigger_jobs:
@@ -145,16 +115,10 @@
     stream:
       - "master":
           branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
+      - "montreal":
+          branch: "montreal"
     functionality:
       - "pap"
     trigger_jobs:
@@ -172,16 +136,10 @@
     stream:
       - "master":
           branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
+      - "montreal":
+          branch: "montreal"
     functionality:
       - "api"
     trigger_jobs:
@@ -199,16 +157,10 @@
     stream:
       - "master":
           branch: "master"
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
+      - "montreal":
+          branch: "montreal"
     functionality:
       - "clamp"
     trigger_jobs:
diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index 49ce6b8bb..f8e6f8afa 100644
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -28,6 +28,8 @@
     stream:
       - "master":
           branch: "master"
+      - "montreal":
+          branch: "montreal"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-distribution-settings"
@@ -63,14 +65,6 @@
 
     project: "policy/distribution"
     stream:
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
     mvn-settings: "policy-distribution-settings"
diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index d21500c3d..ee6ae2ce4 100644
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -24,14 +24,6 @@
 
     project: "policy/docker"
     stream:
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
     files: "**"
@@ -67,6 +59,8 @@
     stream:
       - "master":
           branch: "master"
+      - "montreal":
+          branch: "montreal"
     files: "**"
     archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index a3fe3d8fe..63d52e156 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -26,14 +26,6 @@
 
     project: "policy/drools-applications"
     stream:
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
     mvn-settings: "policy-drools-applications-settings"
@@ -73,6 +65,8 @@
     stream:
       - "master":
           branch: "master"
+      - "montreal":
+          branch: "montreal"
     mvn-settings: "policy-drools-applications-settings"
     mvn-version: "mvn36"
     maven-version: "mvn36"
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 148138a0d..fcd18c25e 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -26,14 +26,6 @@
 
     project: "policy/drools-pdp"
     stream:
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
     mvn-settings: "policy-drools-pdp-settings"
@@ -71,6 +63,8 @@
     stream:
       - "master":
           branch: "master"
+      - "montreal":
+          branch: "montreal"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-drools-pdp-settings"
diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index 505d9f79b..fbf6376b3 100644
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -26,12 +26,6 @@
 
     project: "policy/gui"
     stream:
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
     mvn-settings: "policy-gui-settings"
@@ -69,6 +63,8 @@
     stream:
       - "master":
           branch: "master"
+      - "montreal":
+          branch: "montreal"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-gui-settings"
diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index 49c1cca6d..b2585786b 100644
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -28,6 +28,8 @@
     stream:
       - "master":
           branch: "master"
+      - "montreal":
+          branch: "montreal"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-models-settings"
@@ -63,14 +65,6 @@
 
     project: "policy/models"
     stream:
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
     mvn-settings: "policy-models-settings"
diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index 3b9f1b5b8..509f9969a 100644
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -28,6 +28,8 @@
     stream:
       - "master":
           branch: "master"
+      - "montreal":
+          branch: "montreal"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-pap-settings"
@@ -63,14 +65,6 @@
 
     project: "policy/pap"
     stream:
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
     mvn-settings: "policy-pap-settings"
diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index c194f809d..d20db0336 100644
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -18,6 +18,8 @@
     stream:
       - "master":
           branch: "master"
+      - "montreal":
+          branch: "montreal"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-parent-settings"
@@ -43,14 +45,6 @@
 
     project: "policy/parent"
     stream:
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
     mvn-settings: "policy-parent-settings"
diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index a22effd22..656d9388d 100644
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -26,14 +26,6 @@
 
     project: "policy/xacml-pdp"
     stream:
-      - "honolulu":
-          branch: "honolulu"
-      - "istanbul":
-          branch: "istanbul"
-      - "jakarta":
-          branch: "jakarta"
-      - "kohn":
-          branch: "kohn"
       - "london":
           branch: "london"
     mvn-settings: "policy-xacml-pdp-settings"
@@ -71,6 +63,8 @@
     stream:
       - "master":
           branch: "master"
+      - "montreal":
+          branch: "montreal"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-xacml-pdp-settings"