Add policy-api csit into Jenkins job list

Includes:
1) Added policy-api.yaml
2) Appended policy-api csit to the job list in policy-csit.yaml

Issue-ID: POLICY-1270
Change-Id: I0c32a53f1a12b09b335aa3508d3ab409aec6a74f
Signed-off-by: Chenfei Gao <cgao@research.att.com>

diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 9c2874b..ccf18d3 100644 (file)
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -4,7 +4,16 @@
     project-name: 'policy-api'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-merge-java':
+          docker-pom: 'pom.xml'
+          mvn-params: '-P docker'
+          build-node: ubuntu1604-docker-8c-8g
+      - '{project-name}-{stream}-docker-version-java-daily':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-params: '-Dmaven.test.skip=true'
+          disabled: true
+          build-node: ubuntu1604-docker-8c-8g
 
     project: 'policy/api'
     stream:

diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index 90ee700..5692314 100644 (file)
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -53,3 +53,19 @@
       - 'policy-distribution-{stream}-merge-java'
     robot-options: ''
     branch: 'master'
+
+- 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: ''
+    branch: 'master'