Adding xacml-pdp to jenkins job list

Includes:
1) Modified policy-xacml-pdp.yaml
2) Modified policy-csit.yaml

Change-Id: I98373be472c0c97f928af7fa2ae2fb29e6b3768c
Issue-ID: POLICY-1436
Signed-off-by: Michael Mokry <michael.mokry@att.com>

diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index 5692314..a082363 100644 (file)
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -69,3 +69,19 @@
       - 'policy-api-{stream}-merge-java'
     robot-options: ''
     branch: 'master'
+
+- project:
+    name: policy-xacml-pdp-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'policy'
+    stream:
+      - 'master':
+          branch: master
+    functionality:
+      - 'xacml-pdp'
+    trigger_jobs:
+      - 'policy-xacml-pdp-{stream}-merge-java'
+    robot-options: ''
+    branch: 'master'

diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index 83e590c..5726eb0 100644 (file)
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -4,7 +4,16 @@
     project-name: 'policy-xacml-pdp'
     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/xacml-pdp'
     stream: