X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fpolicy%2Fpolicy-csit.yaml;h=be3f5c867042797a803e5105d2bdcfe9ee0dd7d5;hb=dd2d63c9d5657d0534d849060c9405f919d0b2f3;hp=50d64f6189c32dfbf52990f89bbd130c42b02f27;hpb=233f26626528e5c02f16f9bc5230a6220902730e;p=ci-management.git

diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index 50d64f618..be3f5c867 100644
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -1,20 +1,21 @@
 - project:
-    name: policy-health-csit
+    name: policy-api-project-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'policy'
+      - '{project-name}-{stream}-project-csit-{functionality}'
+    project-name: 'policy-api'
+    recipients: 'takamune.cho@att.com'
+    project: 'policy/docker'
     stream:
       - 'master':
-          branch: master
+          branch: 'master'
+      - 'guilin':
+          branch: 'guilin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     functionality:
-      - 'health'
+      - 'api'
     trigger_jobs:
-      - 'policy-engine-{stream}-merge-java'
-      - 'policy-drools-pdp-{stream}-merge-java'
-      - 'policy-drools-applications-{stream}-merge-java'
-    robot-options: ''
-    build-timeout: 40
+      - 'policy-api-{stream}-merge-java'
 
 - project:
     name: policy-apex-pdp-csit
@@ -22,10 +23,15 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
+    java-version: openjdk11
     recipients: 'liam.fallon@est.tech ram.krishna.verma@est.tech'
     stream:
       - 'master':
           branch: master
+      - 'frankfurt':
+          branch: frankfurt
+      - 'guilin':
+          branch: guilin
     functionality:
       - 'apex-pdp'
     trigger_jobs:
@@ -38,41 +44,36 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
+    java-version: openjdk11
     recipients: 'ram.krishna.verma@est.tech'
     stream:
       - 'master':
           branch: master
+      - 'frankfurt':
+          branch: frankfurt
+      - 'guilin':
+          branch: guilin
     functionality:
       - 'distribution'
     trigger_jobs:
       - 'policy-distribution-{stream}-merge-java'
     robot-options: ''
 
-- project:
-    name: policy-api-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'policy'
-    stream:
-      - 'master':
-          branch: master
-    functionality:
-      - 'api'
-    trigger_jobs:
-      - 'policy-api-{stream}-merge-java'
-    robot-options: ''
-
 - project:
     name: policy-xacml-pdp-csit
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
+    java-version: openjdk11
     recipients: 'ah999m@att.com'
     stream:
       - 'master':
           branch: master
+      - 'frankfurt':
+          branch: frankfurt
+      - 'guilin':
+          branch: guilin
     functionality:
       - 'xacml-pdp'
     trigger_jobs:
@@ -85,10 +86,15 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
+    java-version: openjdk11
     recipients: 'jrh3@att.com ram.krishna.verma@est.tech'
     stream:
       - 'master':
           branch: master
+      - 'frankfurt':
+          branch: frankfurt
+      - 'guilin':
+          branch: guilin
     functionality:
       - 'pap'
     trigger_jobs:
@@ -101,9 +107,14 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
+    java-version: openjdk11
     stream:
       - 'master':
           branch: master
+      - 'frankfurt':
+          branch: frankfurt
+      - 'guilin':
+          branch: guilin
     functionality:
       - 'drools-pdp'
     trigger_jobs:
@@ -116,9 +127,14 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
+    java-version: openjdk11
     stream:
       - 'master':
           branch: master
+      - 'frankfurt':
+          branch: frankfurt
+      - 'guilin':
+          branch: guilin
     functionality:
       - 'drools-applications'
     trigger_jobs: