Attempt to fix logging-analytics maven-stage-master job

[ci-management.git] / jjb / policy / policy-csit.yaml

diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index 33ad95d..b0b61db 100644 (file)
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -7,8 +7,6 @@
     stream:
       - 'master':
           branch: master
-      - 'casablanca':
-          branch: casablanca
     functionality:
       - 'health'
     trigger_jobs:
@@ -16,7 +14,7 @@
       - 'policy-drools-pdp-{stream}-merge-scm-mvn-script'
       - 'policy-drools-applications-{stream}-merge-java'
     robot-options: ''
-    branch: 'master'
+    build-timeout: 40
 
 - project:
     name: policy-apex-pdp-csit
@@ -27,14 +25,11 @@
     stream:
       - 'master':
           branch: master
-      - 'casablanca':
-          branch: casablanca
     functionality:
       - 'apex-pdp'
     trigger_jobs:
-      - 'policy-apex-pdp-{stream}-merge-scm-mvn-script'
+      - 'policy-apex-pdp-{stream}-merge-java'
     robot-options: ''
-    branch: 'master'
 
 - project:
     name: policy-distribution-csit
@@ -45,14 +40,11 @@
     stream:
       - 'master':
           branch: master
-      - 'casablanca':
-          branch: casablanca
     functionality:
       - 'distribution'
     trigger_jobs:
       - 'policy-distribution-{stream}-merge-java'
     robot-options: ''
-    branch: 'master'
 
 - project:
     name: policy-api-csit
@@ -68,7 +60,6 @@
     trigger_jobs:
       - 'policy-api-{stream}-merge-java'
     robot-options: ''
-    branch: 'master'
 
 - project:
     name: policy-xacml-pdp-csit
@@ -84,7 +75,6 @@
     trigger_jobs:
       - 'policy-xacml-pdp-{stream}-merge-java'
     robot-options: ''
-    branch: 'master'
 
 - project:
     name: policy-pap-csit
@@ -100,4 +90,34 @@
     trigger_jobs:
       - 'policy-pap-{stream}-merge-java'
     robot-options: ''
-    branch: 'master'
\ No newline at end of file
+
+- project:
+    name: policy-drools-pdp-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'policy'
+    stream:
+      - 'master':
+          branch: master
+    functionality:
+      - 'drools-pdp'
+    trigger_jobs:
+      - 'policy-drools-pdp-{stream}-merge-java'
+    robot-options: ''
+
+- project:
+    name: policy-drools-applications-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'policy'
+    stream:
+      - 'master':
+          branch: master
+    functionality:
+      - 'drools-applications'
+    trigger_jobs:
+      - 'policy-drools-applications-{stream}-merge-java'
+    robot-options: ''
+