Add mvn-params to verify-java

[ci-management.git] / jjb / global-templates-java.yaml

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index f520d38..171fdb1 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -90,6 +90,8 @@
           artifacts: '{archive-artifacts}'
       - maven-exec:
           maven-version: '{maven-version}'
+      - maven-params:
+          mvn-params: '{mvn-params}'
 
     scm:
       - gerrit-trigger-scm:
@@ -115,7 +117,7 @@
       - maven-target:
           maven-version: '{maven-version}'
           goals: 'clean install -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
+            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn {mvn-params}'
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'
@@ -327,6 +329,7 @@
 
     project-type: freestyle
     node: '{build-node}'
+    disabled: '{disabled}'
     maven-deploy-properties:
     properties:
       - infra-properties:
@@ -398,6 +401,7 @@
     name: '{project-name}-{stream}-release-java-daily-checkstyle'
     project-type: freestyle
     node: '{build-node}'
+    disabled: '{disabled}'
     maven-deploy-properties:
     properties:
       - infra-properties:
@@ -464,16 +468,15 @@
     #
     # The purpose of this job template is to run:
     # 1. maven set versions
-    # 2. maven clean deploy
-    #
-    # This template skips Sonar scans.
+    # 2. maven clean deploy with Sonar scans
     #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
 
-    name: '{project-name}-{stream}-release-version-java-daily-no-sonar'
+    name: '{project-name}-{stream}-release-version-java-daily'
 
     project-type: freestyle
+    disabled: '{disabled}'
     node: '{build-node}'
     maven-deploy-properties:
     properties:
@@ -540,22 +543,20 @@
           maven-version: '{maven-version}'
 
 - job-template:
-    # Job template for Java daily release jobs for subprojects
+    # Job template for Java daily release jobs
     #
     # The purpose of this job template is to run:
     # 1. maven set versions
-    # 2. maven clean deploy
-    #
-    # This template skips Sonar scans.
-    # This job supports subprojects.
+    # 2. maven clean deploy -P {mvn-profile} with Sonar scans
     #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
 
-    name: '{project-name}-{stream}-{subproject}-release-version-java-daily-no-sonar'
+    name: '{project-name}-{stream}-release-version-profile-java-daily'
 
     project-type: freestyle
     node: '{build-node}'
+    disabled: '{disabled}'
     maven-deploy-properties:
     properties:
       - infra-properties:
@@ -582,7 +583,7 @@
 
     triggers:
       # 11 AM UTC
-      - timed: 'H H(10-17) * * *'
+      - timed: 'H 11 * * *'
       - gerrit-trigger-release-manually:
           server: '{server-name}'
           project: '{project}'
@@ -597,7 +598,6 @@
           properties-file: version.properties
       - maven-target:
           maven-version: '{maven-version}'
-          pom: '{pom}'
           goals: 'versions:set versions:update-child-modules versions:commit -B'
           properties:
             - 'newVersion=${{release_version}}'
@@ -608,8 +608,7 @@
 
       - maven-target:
           maven-version: '{maven-version}'
-          pom: '{pom}'
-          goals: 'clean deploy -B
+          goals: 'clean deploy -P {mvn-profile} -B
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           properties:
             - '{maven-deploy-properties}'
@@ -622,20 +621,24 @@
       - infra-shiplogs:
           maven-version: '{maven-version}'
 
+
 - job-template:
-    # Job template for Java daily release jobs
+    # Job template for Java daily release jobs with POM not at the root
     #
     # The purpose of this job template is to run:
-    # 1. maven set versions
-    # 2. maven clean deploy with Sonar scans
+    # 1. maven clean deploy with Sonar scans
+    #
+    # This job supports subprojects.
     #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
+    #     pom:       name/location of the pom.xml file relative to the workspace
 
-    name: '{project-name}-{stream}-release-version-java-daily'
+    name: '{project-name}-{stream}-{subproject}-release-java-daily'
 
     project-type: freestyle
     node: '{build-node}'
+    disabled: '{disabled}'
     maven-deploy-properties:
     properties:
       - infra-properties:
@@ -662,7 +665,7 @@
 
     triggers:
       # 11 AM UTC
-      - timed: 'H H(10-17) * * *'
+      - timed: 'H 11 * * *'
       - gerrit-trigger-release-manually:
           server: '{server-name}'
           project: '{project}'
@@ -673,24 +676,15 @@
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
 
-      - inject:
-          properties-file: version.properties
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: 'versions:set versions:update-child-modules versions:commit -B'
-          properties:
-            - 'newVersion=${{release_version}}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
       - maven-target:
           maven-version: '{maven-version}'
+          pom: '{pom}'
           goals: 'clean deploy -B
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           properties:
             - '{maven-deploy-properties}'
+          java-opts:
+            - '-Xmx4096m -XX:MaxPermSize=512m'
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'
@@ -701,19 +695,23 @@
           maven-version: '{maven-version}'
 
 - job-template:
-    # Job template for Java daily release jobs
+    # Job template for Java daily release jobs with POM not at the root
     #
     # The purpose of this job template is to run:
     # 1. maven set versions
-    # 2. maven clean deploy -P {mvn-profile} with Sonar scans
+    # 2. maven clean deploy with Sonar scans
+    #
+    # This job supports subprojects.
     #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
+    #     pom:       name/location of the pom.xml file relative to the workspace
 
-    name: '{project-name}-{stream}-release-version-profile-java-daily'
+    name: '{project-name}-{stream}-{subproject}-release-version-java-daily'
 
     project-type: freestyle
     node: '{build-node}'
+    disabled: '{disabled}'
     maven-deploy-properties:
     properties:
       - infra-properties:
@@ -755,6 +753,7 @@
           properties-file: version.properties
       - maven-target:
           maven-version: '{maven-version}'
+          pom: '{pom}'
           goals: 'versions:set versions:update-child-modules versions:commit -B'
           properties:
             - 'newVersion=${{release_version}}'
@@ -763,75 +762,6 @@
           global-settings: 'global-settings'
           global-settings-type: cfp
 
-      - maven-target:
-          maven-version: '{maven-version}'
-          goals: 'clean deploy -P {mvn-profile} -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          properties:
-            - '{maven-deploy-properties}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
-
-- job-template:
-    # Job template for Java daily release jobs with POM not at the root
-    #
-    # The purpose of this job template is to run:
-    # 1. maven clean deploy with Sonar scans
-    #
-    # This job supports subprojects.
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-    #     pom:       name/location of the pom.xml file relative to the workspace
-
-    name: '{project-name}-{stream}-{subproject}-release-java-daily'
-
-    project-type: freestyle
-    node: '{build-node}'
-    maven-deploy-properties:
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      # 11 AM UTC
-      - timed: 'H 11 * * *'
-      - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-
       - maven-target:
           maven-version: '{maven-version}'
           pom: '{pom}'
@@ -839,8 +769,6 @@
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           properties:
             - '{maven-deploy-properties}'
-          java-opts:
-            - '-Xmx4096m -XX:MaxPermSize=512m'
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'
@@ -863,10 +791,11 @@
     #     branch:    git branch (eg. stable/lithium or master)
     #     pom:       name/location of the pom.xml file relative to the workspace
 
-    name: '{project-name}-{stream}-{subproject}-release-version-java-daily'
+    name: '{project-name}-{stream}-{subproject}-release-version-java-shell-daily'
 
     project-type: freestyle
     node: '{build-node}'
+    disabled: '{disabled}'
     maven-deploy-properties:
     properties:
       - infra-properties:
@@ -917,10 +846,12 @@
           global-settings: 'global-settings'
           global-settings-type: cfp
 
+      - shell: '{script}'
+
       - maven-target:
           maven-version: '{maven-version}'
           pom: '{pom}'
-          goals: 'clean deploy -B
+          goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           properties:
             - '{maven-deploy-properties}'
@@ -1271,7 +1202,7 @@
     name: '{project-name}-{stream}-docker-java-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
-
+    disabled: '{disabled}'
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -1340,6 +1271,7 @@
     name: '{project-name}-{stream}-docker-java-properties-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
+    disabled: '{disabled}'
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -1412,7 +1344,7 @@
     name: '{project-name}-{stream}-docker-java-shell-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
-
+    disabled: '{disabled}'
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -1481,7 +1413,7 @@
     name: '{project-name}-{stream}-docker-java-version-shell-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
-
+    disabled: '{disabled}'
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -1565,7 +1497,7 @@
     name: '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
-
+    disabled: '{disabled}'
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -1650,7 +1582,7 @@
     name: '{project-name}-{stream}-docker-version-java-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
-
+    disabled: '{disabled}'
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -1731,7 +1663,7 @@
     name: '{project-name}-{stream}-{subproject}-docker-version-java-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
-
+    disabled: '{disabled}'
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -1813,7 +1745,7 @@
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
     docker-image-name: ''
-
+    disabled: '{disabled}'
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -1901,6 +1833,7 @@
     name: '{project-name}-{stream}-{subproject}-aai-docker-java-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
+    disabled: '{disabled}'
     docker-image-name: ''
 
     properties:
@@ -1992,6 +1925,7 @@
 
     project-type: freestyle
     node: '{build-node}'
+    disabled: '{disabled}'
     maven-deploy-properties:
     properties:
       - infra-properties:
@@ -2073,6 +2007,7 @@
 
     project-type: freestyle
     node: '{build-node}'
+    disabled: '{disabled}'
     maven-deploy-properties:
     properties:
       - infra-properties:
@@ -2157,6 +2092,7 @@
 
     project-type: freestyle
     node: '{build-node}'
+    disabled: '{disabled}'
     maven-deploy-properties:
     properties:
       - infra-properties:
@@ -2218,85 +2154,6 @@
       - infra-shiplogs:
           maven-version: '{maven-version}'
 
-- job-template:
-    # Template for maven site plugin invocation
-    #
-    # It's designed to be triggered when the trigger-job job
-    # succeeds as there's no need for new documentaiton
-    # if the build job fails.
-    #
-    # The purpose of this job template is to run:
-    # 1. maven set versions
-    # 2. maven clean site
-    #
-    # Those parameters should be set :
-    # - site-pom : the pom file that contains the site confiration
-    # - trigger-job : the name of the project that triggers this job
-    #                     upon success. The job name can be
-    #                     parameterized.
-
-    name: '{project-name}-{stream}-stage-site-java'
-    project-type: freestyle
-    node: '{build-node}'
-    pom: 'pom.xml'
-
-    properties:
-      - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - maven-exec:
-          maven-version: '{maven-version}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
-
-    wrappers:
-      - infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - trigger-on-build-success:
-          job-name: '{trigger-job}'
-
-    builders:
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - inject:
-          properties-file: version.properties
-      - maven-target:
-          maven-version: '{maven-version}'
-          pom: '{pom}'
-          goals: 'versions:set versions:update-child-modules versions:commit -B'
-          properties:
-            - 'newVersion=${{release_version}}'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-      - maven-target:
-          maven-version: '{maven-version}'
-          pom: '{site-pom}'
-          goals: 'clean site:site site:stage-deploy -B'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
 - job-template:
     # Job template for Java merge jobs for SDC specific repos
     #
@@ -2348,7 +2205,7 @@
 
       - docker-login
 
-      - maven-docker-push-daily:
+      - maven-docker-push-daily-test:
           maven-version: '{maven-version}'
           mvn-settings: '{mvn-settings}'
           pom: '{docker-pom}'
@@ -2374,7 +2231,7 @@
     name: '{project-name}-{stream}-aai-docker-java-version-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
-
+    disabled: '{disabled}'
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'