From 9ad190a17e3b7be8dbdbaaab0ef507a0d97bde1b Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Fri, 19 Oct 2018 16:42:21 -0700 Subject: POLICY-Refactor CLM project block The clm job portion needs to be on its own project section similar to the Sonar portion. The reason behind this, is because we only want this job to be running for master and no other branches. Also, this is in preparation for the work that is to come from global-jjb on application names in CLM. Change-Id: I7f4c631fb4b91cfd050f2cf8926e169e75812bd6 Issue-ID: CIMAN-213 Signed-off-by: Jessica Wagantall --- jjb/policy/policy-apex-pdp.yaml | 10 +++++++++- jjb/policy/policy-api.yaml | 10 +++++++++- jjb/policy/policy-common.yaml | 10 +++++++++- jjb/policy/policy-core.yaml | 10 +++++++++- jjb/policy/policy-distribution.yaml | 10 +++++++++- jjb/policy/policy-drools-applications.yaml | 10 +++++++++- jjb/policy/policy-drools-pdp.yaml | 12 ++++++++++-- jjb/policy/policy-engine.yaml | 12 ++++++++++-- jjb/policy/policy-gui.yaml | 10 +++++++++- jjb/policy/policy-models.yaml | 10 +++++++++- jjb/policy/policy-pap.yaml | 10 +++++++++- jjb/policy/policy-parent.yaml | 10 +++++++++- jjb/policy/policy-pdp.yaml | 10 +++++++++- jjb/policy/policy-xacml-pdp.yaml | 10 +++++++++- 14 files changed, 128 insertions(+), 16 deletions(-) diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index 7b490cb2a..788f0e7d1 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -3,7 +3,6 @@ name: policy-apex-pdp project-name: 'policy-apex-pdp' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-scm-mvn-script': mvn-goals: 'clean deploy -B @@ -39,3 +38,12 @@ mvn-settings: 'policy-apex-pdp-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: policy-apex-pdp-clm + jobs: + - gerrit-maven-clm + project: policy/apex-pdp + project-name: 'policy-apex-pdp' + branch: 'master' + mvn-settings: 'policy-apex-pdp-settings' diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index 29977b9fa..e8b565890 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -3,7 +3,6 @@ name: policy-api project-name: 'policy-api' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -28,3 +27,12 @@ mvn-settings: 'policy-api-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: policy-api-clm + jobs: + - gerrit-maven-clm + project: policy/api + project-name: 'policy-api' + branch: 'master' + mvn-settings: 'policy-api-settings' diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index 8607d28cc..6613576dd 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -3,7 +3,6 @@ name: policy-common project-name: 'policy-common' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': @@ -30,3 +29,12 @@ mvn-settings: 'policy-common-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: policy-common-clm + jobs: + - gerrit-maven-clm + project: policy/common + project-name: 'policy-common' + branch: 'master' + mvn-settings: 'policy-common-settings' diff --git a/jjb/policy/policy-core.yaml b/jjb/policy/policy-core.yaml index 1506f6c48..4f457eb1f 100644 --- a/jjb/policy/policy-core.yaml +++ b/jjb/policy/policy-core.yaml @@ -3,7 +3,6 @@ name: policy-core project-name: 'policy-core' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -28,3 +27,12 @@ mvn-settings: 'policy-core-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: policy-core-clm + jobs: + - gerrit-maven-clm + project: policy/core + project-name: 'policy-core' + branch: 'master' + mvn-settings: 'policy-core-settings' diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index bc5bcc672..53fc51083 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.yaml @@ -3,7 +3,6 @@ name: policy-distribution project-name: 'policy-distribution' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java': docker-pom: 'pom.xml' @@ -37,3 +36,12 @@ mvn-settings: 'policy-distribution-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: policy-distribution-clm + jobs: + - gerrit-maven-clm + project: policy/distribution + project-name: 'policy-distribution' + branch: 'master' + mvn-settings: 'policy-distribution-settings' diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index 04f5ef392..31f9ba9e1 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -3,7 +3,6 @@ name: policy-drools-applications project-name: 'policy-drools-applications' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': @@ -30,3 +29,12 @@ mvn-settings: 'policy-drools-applications-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: policy-drools-applications-clm + jobs: + - gerrit-maven-clm + project: policy/drools-applications + project-name: 'policy-drools-applications' + branch: 'master' + mvn-settings: 'policy-drools-applications-settings' diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index cb125b02c..717eedc8f 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -3,8 +3,6 @@ name: policy-drools-pdp project-name: 'policy-drools-pdp' jobs: - - gerrit-maven-clm: - mvn-params: '-DskipTests' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-scm-mvn-script': mvn-goals: 'clean deploy -B @@ -40,3 +38,13 @@ mvn-settings: 'policy-drools-pdp-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: policy-drools-pdp-clm + jobs: + - gerrit-maven-clm: + mvn-params: '-DskipTests' + project: policy/drools-pdp + project-name: 'policy-drools-pdp' + branch: 'master' + mvn-settings: 'policy-drools-pdp-settings' diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index f116f7bf5..0dc51b12f 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -3,8 +3,6 @@ name: policy-engine project-name: 'policy-engine' jobs: - - gerrit-maven-clm: - build-timeout: 30 - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-scm-mvn-script': mvn-goals: 'clean deploy -B @@ -40,3 +38,13 @@ mvn-settings: 'policy-engine-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: policy-engine-clm + jobs: + - gerrit-maven-clm: + build-timeout: 30 + project: policy/engine + project-name: 'policy-engine' + branch: 'master' + mvn-settings: 'policy-engine-settings' diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml index 43a35c56d..40b9dc1f4 100644 --- a/jjb/policy/policy-gui.yaml +++ b/jjb/policy/policy-gui.yaml @@ -3,7 +3,6 @@ name: policy-gui project-name: 'policy-gui' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -28,3 +27,12 @@ mvn-settings: 'policy-gui-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: policy-gui-clm + jobs: + - gerrit-maven-clm + project: policy/gui + project-name: 'policy-gui' + branch: 'master' + mvn-settings: 'policy-gui-settings' diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml index 60d4881a7..e8513be55 100644 --- a/jjb/policy/policy-models.yaml +++ b/jjb/policy/policy-models.yaml @@ -3,7 +3,6 @@ name: policy-models project-name: 'policy-models' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -28,3 +27,12 @@ mvn-settings: 'policy-models-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: policy-models-clm + jobs: + - gerrit-maven-clm + project: policy/models + project-name: 'policy-models' + branch: 'master' + mvn-settings: 'policy-models-settings' diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index ad789b25a..13f2701e6 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -3,7 +3,6 @@ name: policy-pap project-name: 'policy-pap' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -28,3 +27,12 @@ mvn-settings: 'policy-pap-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: policy-pap-clm + jobs: + - gerrit-maven-clm + project: policy/pap + project-name: 'policy-pap' + branch: 'master' + mvn-settings: 'policy-pap-settings' diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml index 13e97a68e..34f357813 100644 --- a/jjb/policy/policy-parent.yaml +++ b/jjb/policy/policy-parent.yaml @@ -3,7 +3,6 @@ name: policy-parent project-name: 'policy-parent' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -16,3 +15,12 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g + +- project: + name: policy-parent-clm + jobs: + - gerrit-maven-clm + project: policy/parent + project-name: 'policy-parent' + branch: 'master' + mvn-settings: 'policy-parent-settings' diff --git a/jjb/policy/policy-pdp.yaml b/jjb/policy/policy-pdp.yaml index f124bb4c0..2d299b4d1 100644 --- a/jjb/policy/policy-pdp.yaml +++ b/jjb/policy/policy-pdp.yaml @@ -3,7 +3,6 @@ name: policy-pdp project-name: 'policy-pdp' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -28,3 +27,12 @@ mvn-settings: 'policy-pdp-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: policy-pdp-clm + jobs: + - gerrit-maven-clm + project: policy/pdp + project-name: 'policy-pdp' + branch: 'master' + mvn-settings: 'policy-pdp-settings' diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml index 8da603c0b..0b45026c7 100644 --- a/jjb/policy/policy-xacml-pdp.yaml +++ b/jjb/policy/policy-xacml-pdp.yaml @@ -3,7 +3,6 @@ name: policy-xacml-pdp project-name: 'policy-xacml-pdp' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -28,3 +27,12 @@ mvn-settings: 'policy-xacml-pdp-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: policy-xacml-pdp-clm + jobs: + - gerrit-maven-clm + project: policy/xacml-pdp + project-name: 'policy-xacml-pdp' + branch: 'master' + mvn-settings: 'policy-xacml-pdp-settings' -- cgit 1.2.3-korg