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-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index f23b9c1..e1cfe9d 100644
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -21,7 +21,7 @@
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
script:
!include-raw-escape: 'include-raw-docker-release.sh'
- disabled: false
+ disabled: true
build-node: ubuntu1604-docker-8c-8g
project: 'policy/apex-pdp'
stream:
@@ -33,8 +33,8 @@
build-node: ubuntu1604-builder-4c-4g
- project:
- name: policy-apex-pdp-casablanca
- project-name: 'policy-apex-pdp-casablanca'
+ name: policy-apex-pdp-dublin
+ project-name: 'policy-apex-pdp-dublin'
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-scm-mvn-script':
@@ -48,12 +48,12 @@
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
script:
!include-raw-escape: 'include-raw-docker-release.sh'
- disabled: true
+ disabled: false
build-node: ubuntu1604-docker-8c-8g
project: 'policy/apex-pdp'
stream:
- - 'casablanca':
- branch: 'casablanca'
+ - 'dublin':
+ branch: 'dublin'
mvn-settings: 'policy-apex-pdp-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 9462909..f5763e0 100644
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.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/api'
@@ -25,6 +25,28 @@
build-node: ubuntu1604-builder-4c-4g
- project:
+ name: policy-api-dublin
+ project-name: 'policy-api-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/api'
+ stream:
+ - 'dublin':
+ branch: 'dublin'
+ mvn-settings: 'policy-api-settings'
+
+- project:
name: policy-api-sonar
jobs:
- gerrit-maven-sonar
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index ccf6c75..5237719 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -6,7 +6,7 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily':
- disabled: false
+ disabled: true
project: 'policy/common'
stream:
@@ -18,18 +18,18 @@
build-node: ubuntu1604-builder-4c-4g
- project:
- name: policy-common-casablanca
- project-name: 'policy-common-casablanca'
+ name: policy-common-dublin
+ project-name: 'policy-common-dublin'
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily':
- disabled: true
+ disabled: false
project: 'policy/common'
stream:
- - 'casablanca':
- branch: 'casablanca'
+ - 'dublin':
+ branch: 'dublin'
mvn-settings: 'policy-common-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index cedbc64..fe89f30 100644
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -7,6 +7,8 @@
stream:
- 'master':
branch: master
+ - 'dublin':
+ branch: dublin
functionality:
- 'health'
trigger_jobs:
@@ -15,7 +17,6 @@
- 'policy-drools-applications-{stream}-merge-java'
robot-options: ''
build-timeout: 40
- branch: 'master'
- project:
name: policy-apex-pdp-csit
@@ -26,12 +27,13 @@
stream:
- 'master':
branch: master
+ - 'dublin':
+ branch: dublin
functionality:
- 'apex-pdp'
trigger_jobs:
- 'policy-apex-pdp-{stream}-merge-scm-mvn-script'
robot-options: ''
- branch: 'master'
- project:
name: policy-distribution-csit
@@ -42,12 +44,13 @@
stream:
- 'master':
branch: master
+ - 'dublin':
+ branch: dublin
functionality:
- 'distribution'
trigger_jobs:
- 'policy-distribution-{stream}-merge-java'
robot-options: ''
- branch: 'master'
- project:
name: policy-api-csit
@@ -58,12 +61,13 @@
stream:
- 'master':
branch: master
+ - 'dublin':
+ branch: dublin
functionality:
- 'api'
trigger_jobs:
- 'policy-api-{stream}-merge-java'
robot-options: ''
- branch: 'master'
- project:
name: policy-xacml-pdp-csit
@@ -74,12 +78,13 @@
stream:
- 'master':
branch: master
+ - 'dublin':
+ branch: dublin
functionality:
- 'xacml-pdp'
trigger_jobs:
- 'policy-xacml-pdp-{stream}-merge-java'
robot-options: ''
- branch: 'master'
- project:
name: policy-pap-csit
@@ -90,12 +95,13 @@
stream:
- 'master':
branch: master
+ - 'dublin':
+ branch: dublin
functionality:
- 'pap'
trigger_jobs:
- 'policy-pap-{stream}-merge-java'
robot-options: ''
- branch: 'master'
- project:
name: policy-drools-pdp-csit
@@ -106,12 +112,13 @@
stream:
- 'master':
branch: master
+ - 'dublin':
+ branch: dublin
functionality:
- 'drools-pdp'
trigger_jobs:
- 'policy-drools-pdp-{stream}-merge-java'
robot-options: ''
- branch: 'master'
- project:
name: policy-drools-applications-csit
@@ -122,10 +129,11 @@
stream:
- 'master':
branch: master
+ - 'dublin':
+ branch: dublin
functionality:
- 'drools-applications'
trigger_jobs:
- 'policy-drools-applications-{stream}-merge-java'
robot-options: ''
- branch: 'master'
diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index 6c5753c..e8a1681 100644
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.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/distribution'
@@ -25,8 +25,8 @@
build-node: ubuntu1604-builder-4c-4g
- project:
- name: policy-distribution-casablanca
- project-name: 'policy-distribution-casablanca'
+ name: policy-distribution-dublin
+ project-name: 'policy-distribution-dublin'
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java':
@@ -37,13 +37,13 @@
docker-pom: 'pom.xml'
mvn-profile: 'docker'
mvn-params: '-Dmaven.test.skip=true'
- disabled: true
+ disabled: false
build-node: ubuntu1604-docker-8c-8g
project: 'policy/distribution'
stream:
- - 'casablanca':
- branch: 'casablanca'
+ - 'dublin':
+ branch: 'dublin'
mvn-settings: 'policy-distribution-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index c378217..6775406 100644
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -13,7 +13,7 @@
docker-pom: 'pom.xml'
mvn-profile: 'docker'
mvn-params: '-P docker'
- disabled: false
+ disabled: true
build-node: ubuntu1604-docker-8c-8g
project: 'policy/docker'
stream:
@@ -25,6 +25,31 @@
build-node: ubuntu1604-builder-4c-4g
- project:
+ name: policy-docker-base-common-dublin
+ project-name: 'policy-docker-dublin'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java':
+ docker-pom: 'pom.xml'
+ mvn-profile: 'docker'
+ 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: '-P docker'
+ disabled: false
+ build-node: ubuntu1604-docker-8c-8g
+ project: 'policy/docker'
+ stream:
+ - 'dublin':
+ branch: 'dublin'
+ mvn-settings: 'policy-docker-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-builder-4c-4g
+
+- project:
name: policy-docker-sonar
jobs:
- gerrit-maven-sonar
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index bab2c2e..66bbb63 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -15,7 +15,7 @@
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
script:
!include-raw-escape: 'drools-apps-docker-release.sh'
- disabled: false
+ disabled: true
build-node: ubuntu1604-docker-8c-8g
project: 'policy/drools-applications'
@@ -28,18 +28,18 @@
build-node: 'ubuntu1604-builder-4c-4g'
- project:
- name: policy-drools-applications-casablanca
- project-name: 'policy-drools-applications-casablanca'
+ name: policy-drools-applications-dublin
+ project-name: 'policy-drools-applications-dublin'
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily':
- disabled: true
+ disabled: false
project: 'policy/drools-applications'
stream:
- - 'casablanca':
- branch: 'casablanca'
+ - 'dublin':
+ branch: 'dublin'
mvn-settings: 'policy-drools-applications-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index c7ab5c2..0bb33b4 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -15,7 +15,7 @@
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
script:
!include-raw-escape: 'include-raw-docker-release.sh'
- disabled: false
+ disabled: true
build-node: ubuntu1604-docker-8c-8g
project: 'policy/drools-pdp'
stream:
@@ -27,8 +27,8 @@
build-node: 'ubuntu1604-builder-4c-4g'
- project:
- name: policy-drools-pdp-casablanca
- project-name: 'policy-drools-pdp-casablanca'
+ name: policy-drools-pdp-dublin
+ project-name: 'policy-drools-pdp-dublin'
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-scm-mvn-script':
@@ -42,12 +42,12 @@
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
script:
!include-raw-escape: 'include-raw-docker-release.sh'
- disabled: true
+ disabled: false
build-node: ubuntu1604-docker-8c-8g
project: 'policy/drools-pdp'
stream:
- - 'casablanca':
- branch: 'casablanca'
+ - 'dublin':
+ branch: 'dublin'
mvn-settings: 'policy-drools-pdp-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index 114adb7..5a6e430 100644
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -15,7 +15,7 @@
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
script:
!include-raw-escape: 'include-raw-docker-release.sh'
- disabled: false
+ disabled: true
build-node: ubuntu1604-docker-8c-8g
project: 'policy/engine'
stream:
@@ -27,8 +27,8 @@
build-node: 'ubuntu1604-builder-4c-4g'
- project:
- name: policy-engine-casablanca
- project-name: 'policy-engine-casablanca'
+ name: policy-engine-dublin
+ project-name: 'policy-engine-dublin'
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-scm-mvn-script':
@@ -42,12 +42,12 @@
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
script:
!include-raw-escape: 'include-raw-docker-release.sh'
- disabled: true
+ disabled: false
build-node: ubuntu1604-docker-8c-8g
project: 'policy/engine'
stream:
- - 'casablanca':
- branch: 'casablanca'
+ - 'dublin':
+ branch: 'dublin'
mvn-settings: 'policy-engine-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index b7507ab..23df1d0 100644
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -6,7 +6,7 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily':
- disabled: false
+ disabled: true
project: 'policy/models'
stream:
@@ -18,6 +18,24 @@
build-node: ubuntu1604-builder-4c-4g
- project:
+ name: policy-models-dublin
+ project-name: 'policy-models-dublin'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily':
+ disabled: false
+
+ project: 'policy/models'
+ stream:
+ - 'dublin':
+ branch: 'dublin'
+ mvn-settings: 'policy-models-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-builder-4c-4g
+
+- project:
name: policy-models-sonar
jobs:
- gerrit-maven-sonar
diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index e33bb23..bd57635 100644
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.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/pap'
@@ -25,6 +25,31 @@
build-node: ubuntu1604-builder-4c-4g
- project:
+ name: policy-pap-dublin
+ project-name: 'policy-pap-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/pap'
+ stream:
+ - 'dublin':
+ branch: 'dublin'
+ mvn-settings: 'policy-pap-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-builder-4c-4g
+
+- project:
name: policy-pap-sonar
jobs:
- gerrit-maven-sonar
diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index 22c1edf..6c35fe6 100644
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -6,7 +6,7 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily':
- disabled: false
+ disabled: true
project: 'policy/parent'
stream:
@@ -18,18 +18,18 @@
build-node: ubuntu1604-builder-4c-4g
- project:
- name: policy-parent-casablanca
- project-name: 'policy-parent-casablanca'
+ name: policy-parent-dublin
+ project-name: 'policy-parent-dublin'
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily':
- disabled: true
+ disabled: false
project: 'policy/parent'
stream:
- - 'casablanca':
- branch: 'casablanca'
+ - 'dublin':
+ branch: 'dublin'
mvn-settings: 'policy-parent-settings'
files: '**'
archive-artifacts: ''
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