Update policy to include dublin branchs
Dublin branches created, need to update jobs to work with
those branches.
Removing trailing branch: master to ensure the correct
branch is used for each csit.
Issue-ID: POLICY-1747
Change-Id: I75dec37e0a49ae0c1bde95ffc6f56b7a8cf3fdb4
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index 1ad7b7a..05aea8e 100644
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -12,7 +12,7 @@
docker-pom: 'pom.xml'
mvn-profile: 'docker'
mvn-params: '-Dmaven.test.skip=true'
- disabled: false
+ disabled: true
build-node: ubuntu1604-docker-8c-8g
project: 'policy/xacml-pdp'
@@ -25,6 +25,31 @@
build-node: ubuntu1604-builder-4c-4g
- project:
+ name: policy-xacml-pdp-dublin
+ project-name: 'policy-xacml-pdp-dublin'
+ jobs:
+ - '{project-name}-{stream}-verify-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: false
+ build-node: ubuntu1604-docker-8c-8g
+
+ project: 'policy/xacml-pdp'
+ stream:
+ - 'dublin':
+ branch: 'dublin'
+ mvn-settings: 'policy-xacml-pdp-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-builder-4c-4g
+
+- project:
name: policy-xacml-pdp-sonar
jobs:
- gerrit-maven-sonar