diff options
Diffstat (limited to 'jjb')
27 files changed, 231 insertions, 29 deletions
diff --git a/jjb/global-templates-c.yaml b/jjb/global-templates-c.yaml index 69aadc83f..9f9bdf9f1 100644 --- a/jjb/global-templates-c.yaml +++ b/jjb/global-templates-c.yaml @@ -44,6 +44,7 @@ files: '**' builders: + - lf-infra-pre-build - shell: '{script}' publishers: @@ -93,6 +94,7 @@ branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' diff --git a/jjb/global-templates-docker.yaml b/jjb/global-templates-docker.yaml index 8d1c40db8..3052dc2db 100644 --- a/jjb/global-templates-docker.yaml +++ b/jjb/global-templates-docker.yaml @@ -100,6 +100,7 @@ <<: *docker_merge_boiler_plate builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -140,6 +141,7 @@ <<: *docker_merge_boiler_plate builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -185,6 +187,7 @@ <<: *docker_verify_boiler_plate builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -227,6 +230,7 @@ <<: *docker_verify_boiler_plate builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -277,6 +281,7 @@ choosing-strategy: default builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -335,6 +340,7 @@ choosing-strategy: default builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -379,6 +385,7 @@ <<: *docker_merge_boiler_plate builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -416,6 +423,7 @@ <<: *docker_merge_boiler_plate builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -461,6 +469,7 @@ <<: *docker_verify_boiler_plate builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -499,6 +508,7 @@ <<: *docker_verify_boiler_plate builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -549,6 +559,7 @@ choosing-strategy: default builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -607,6 +618,7 @@ choosing-strategy: default builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -662,6 +674,7 @@ choosing-strategy: default builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -712,6 +725,7 @@ choosing-strategy: default builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml index a3182cc5c..e891e92df 100644 --- a/jjb/global-templates-golang.yaml +++ b/jjb/global-templates-golang.yaml @@ -45,6 +45,7 @@ files: '**' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -104,6 +105,7 @@ files: '**' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -159,6 +161,7 @@ branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -169,4 +172,4 @@ publishers: - infra-shiplogs: - maven-version: '{maven-version}'
\ No newline at end of file + maven-version: '{maven-version}' diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml index 79a00778a..664d14ea3 100644 --- a/jjb/global-templates-helm.yaml +++ b/jjb/global-templates-helm.yaml @@ -67,6 +67,7 @@ files: '{files}' builders: + - lf-infra-pre-build - shell: '{obj:pre_build_script}' - shell: '{obj:build_script}' @@ -90,6 +91,7 @@ files: '{files}' builders: + - lf-infra-pre-build - lf-provide-maven-settings: global-settings-file: '{mvn-global-settings}' settings-file: '{mvn-settings}' @@ -124,6 +126,7 @@ comment-contains-value: '^stage-helm$' builders: + - lf-infra-pre-build - lf-provide-maven-settings: global-settings-file: '{mvn-global-settings}' settings-file: '{mvn-settings}' @@ -145,6 +148,7 @@ disabled: true builders: + - lf-infra-pre-build - shell: '{pre_build_script}' - shell: '{build_script}' - shell: '{post_build_script}' @@ -157,6 +161,7 @@ disabled: true builders: + - lf-infra-pre-build - shell: '{pre_build_script}' - shell: '{build_script}' - shell: '{post_build_script}' @@ -180,6 +185,7 @@ choosing-strategy: default builders: + - lf-infra-pre-build - shell: '{pre_build_script}' - shell: '{build_script}' - shell: '{post_build_script}' diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 8f17a257f..61da2d5af 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -49,6 +49,7 @@ files: '{obj:pattern}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -150,6 +151,7 @@ branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -217,6 +219,7 @@ project: '{project}' branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -293,6 +296,7 @@ branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -367,6 +371,7 @@ branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -444,6 +449,7 @@ branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -517,6 +523,7 @@ branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -594,6 +601,7 @@ files: '{pattern}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -640,6 +648,7 @@ name: '{project-name}-{stream}-merge-profile-java' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -724,7 +733,7 @@ branch: '{branch}' builders: - + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -809,6 +818,7 @@ project: '{project}' branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -883,7 +893,7 @@ branch: '{branch}' builders: - + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -951,7 +961,7 @@ branch: '{branch}' builders: - + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -1021,7 +1031,7 @@ branch: '{branch}' builders: - + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -1099,7 +1109,7 @@ branch: '{branch}' builders: - + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -1180,7 +1190,7 @@ branch: '{branch}' builders: - + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -1278,7 +1288,7 @@ branch: '{branch}' builders: - + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -1330,6 +1340,7 @@ build-timeout: 120 builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml index 80ae84bb7..b30af0ea5 100644 --- a/jjb/global-templates-python.yaml +++ b/jjb/global-templates-python.yaml @@ -53,6 +53,7 @@ files: '{pattern}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -137,6 +138,7 @@ files: '**' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml index 9264bc9e5..fcbf745fc 100644 --- a/jjb/global-templates-script.yaml +++ b/jjb/global-templates-script.yaml @@ -47,6 +47,7 @@ files: '**' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -122,6 +123,7 @@ files: '**' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -193,6 +195,7 @@ files: '**' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -260,6 +263,7 @@ branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -315,6 +319,7 @@ build-timeout: '{build-timeout}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' diff --git a/jjb/multicloud/multicloud-azure-csit.yaml b/jjb/multicloud/multicloud-azure-csit.yaml new file mode 100644 index 000000000..10946318a --- /dev/null +++ b/jjb/multicloud/multicloud-azure-csit.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: multicloud-azure-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'multicloud-azure' + stream: 'master' + functionality: + - 'functionality1': + trigger_jobs: 'multicloud-azure-master-docker-java-version-shell-daily' + robot-options: '' + branch: 'master' diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml index f9e94f92b..b4590be97 100644 --- a/jjb/multicloud/multicloud-azure-java.yaml +++ b/jjb/multicloud/multicloud-azure-java.yaml @@ -12,7 +12,6 @@ pom: 'azure/pom.xml' pattern: 'azure/**' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-{subproject}-verify-java' @@ -39,3 +38,12 @@ mvn-settings: 'multicloud-azure-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: multicloud-azure-java-clm + jobs: + - gerrit-maven-clm + project: multicloud/azure + project-name: 'multicloud-azure' + branch: 'master' + mvn-settings: 'multicloud-azure-settings' diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index 8f20092cd..8da6ac993 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -12,7 +12,6 @@ pom: 'multivimbroker/pom.xml' pattern: 'multivimbroker/**' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-{subproject}-verify-java' @@ -39,3 +38,12 @@ mvn-settings: 'multicloud-framework-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: multicloud-framework-java-clm + jobs: + - gerrit-maven-clm + project: multicloud/framework + project-name: 'multicloud-framework' + branch: 'master' + mvn-settings: 'multicloud-framework-settings' diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml index 00f6d025f..0743a2425 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -12,7 +12,6 @@ pom: 'vio/pom.xml' pattern: 'vio/**' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-{subproject}-verify-java' @@ -39,3 +38,12 @@ mvn-settings: 'multicloud-openstack-vmware-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: multicloud-openstack-vmware-java-clm + jobs: + - gerrit-maven-clm + project: multicloud/openstack/vmware + project-name: 'multicloud-openstack-vmware' + branch: 'master' + mvn-settings: 'multicloud-openstack-vmware-settings' diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index d6cc74d47..0ff1cc55f 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -37,7 +37,6 @@ pattern: 'windriver/**' pom: 'windriver/pom.xml' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' @@ -106,3 +105,13 @@ mvn-settings: 'multicloud-openstack-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: multicloud-openstack-clm + jobs: + - gerrit-maven-clm + project: multicloud/openstack + project-name: 'multicloud-openstack' + build-node: ubuntu1604-memcached-4c-4g + branch: 'master' + mvn-settings: 'multicloud-openstack-settings' diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml index 788e75217..39253cd9e 100644 --- a/jjb/optf/optf-cmso.yaml +++ b/jjb/optf/optf-cmso.yaml @@ -39,7 +39,8 @@ - project: name: optf-cmso-sonar jobs: - - gerrit-maven-sonar + - gerrit-maven-sonar: + mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001' cron: 'H 11 * * *' build-node: ubuntu1604-docker-8c-8g project: 'optf/cmso' 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' |