Merge "Add {subproject}-docker-java-version job"

diff --combined jjb/global-templates-java.yaml
index 379429e,db06431..c8d5665
--- 1/jjb/global-templates-java.yaml
--- 2/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@@ -1,4 -1,64 +1,4 @@@
  ---
 -- job-template:
 -    # Template used for running CLM scans
 -    # Arguements:
 -    #   {name}         - Project Shortname
 -    #   {project}      - Fully qualified project name
 -    #   {mvn-settings} - Project maven settings file
 -    #   {jdk}
 -    name: '{project-name}-{stream}-clm'
 -
 -    project-type: freestyle
 -    node: '{build-node}'
 -    jdk: '{jdk}'
 -
 -    properties:
 -      - infra-properties:
 -          build-days-to-keep: 30
 -
 -    parameters:
 -      - infra-parameters:
 -          project: '{project}'
 -          branch: '{branch}'
 -          refspec: 'refs/heads/{branch}'
 -          artifacts: '{archive-artifacts}'
 -
 -    scm:
 -      - git-scm:
 -          refspec: ''
 -          branch: '{branch}'
 -
 -    wrappers:
 -      - infra-wrappers:
 -          build-timeout: '{build-timeout}'
 -
 -    triggers:
 -      - timed: 'H H * * 6'
 -
 -    builders:
 -      - provide-maven-settings:
 -          global-settings-file: 'global-settings'
 -          settings-file: '{mvn-settings}'
 -      - maven-target:
 -          maven-version: 'mvn33'
 -          pom: 'pom.xml'
 -          goals: |
 -              clean install dependency:tree com.sonatype.clm:clm-maven-plugin:index
 -              {onap-infra-mvn-opts}
 -          java-opts:
 -            - '-Xmx4096m -XX:MaxPermSize=512m'
 -          settings: '{mvn-settings}'
 -          settings-type: cfp
 -          global-settings: 'global-settings'
 -          global-settings-type: cfp
 -      - shell: 'find . -regex ".*karaf/target" | xargs rm -rf'
 -      - sonatype-clm:
 -          application-name: '{project-name}'
 -
 -    publishers:
 -      - infra-shiplogs:
 -          maven-version: '{maven-version}'
 -
  - job-template:
      # Job template for Java verify jobs
      #
@@@ -1458,22 -1518,6 +1458,22 @@@
        - provide-maven-settings:
            global-settings-file: 'global-settings'
            settings-file: '{mvn-settings}'
 +      - conditional-step:
 +          condition-kind: regex-match
 +          regex: DoSetVersion
 +          label: '{setVersion}'
 +          steps:
 +            - 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
        - docker-login
        - maven-docker-push-daily:
            maven-version: '{maven-version}'
@@@ -1615,6 -1659,79 +1615,79 @@@
        - infra-shiplogs:
            maven-version: '{maven-version}'
  
+ - job-template:
+     name: '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily'
+     project-type: freestyle
+     node: 'ubuntu1604-docker-8c-8g'
+ 
+     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:
+       # 12 AM UTC
+       - timed: 'H 12 * * *'
+       - gerrit-trigger-release-manually:
+           server: '{server-name}'
+           project: '{project}'
+           branch: '{branch}'
+ 
+     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
+ 
+       - docker-login
+ 
+       - maven-target:
+           maven-version: '{maven-version}'
+           pom: '{pom}'
+           goals: '{mvn-goals}'
+           settings: '{mvn-settings}'
+           settings-type: cfp
+           global-settings: 'global-settings'
+           global-settings-type: cfp
+ 
+       - shell: '{script}'
+ 
+     publishers:
+       - infra-shiplogs:
+           maven-version: '{maven-version}'
+ 
  - job-template:
      name: '{project-name}-{stream}-docker-version-java-daily'
      project-type: freestyle
@@@ -1674,6 -1791,76 +1747,76 @@@
  
        - maven-docker-push-daily:
            maven-version: '{maven-version}'
+           mvn-settings: '{mvn-settings}'
+           pom: '{docker-pom}'
+           # use default as mvn-profile if profile is not needed
+           mvn-profile: '{mvn-profile}'
+ 
+     publishers:
+       - infra-shiplogs:
+           maven-version: '{maven-version}'
+ 
+ - job-template:
+     name: '{project-name}-{stream}-{subproject}-docker-version-java-daily'
+     project-type: freestyle
+     node: 'ubuntu1604-docker-8c-8g'
+ 
+     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:
+       # 12 AM UTC
+       - timed: 'H 12 * * *'
+       - gerrit-trigger-release-manually:
+           server: '{server-name}'
+           project: '{project}'
+           branch: '{branch}'
+ 
+     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
+ 
+       - docker-login
+ 
+       - maven-docker-push-daily:
+           maven-version: '{maven-version}'
+           pom: '{pom}'
            mvn-settings: '{mvn-settings}'
            pom: '{docker-pom}'
            # use default as mvn-profile if profile is not needed
@@@ -2146,7 -2333,7 +2289,7 @@@
        - maven-target:
            maven-version: '{maven-version}'
            pom: '{site-pom}'
 -          goals: 'clean site:site site:stage-deploy'
 +          goals: 'clean site:site site:stage-deploy -B'
            settings: '{mvn-settings}'
            settings-type: cfp
            global-settings: 'global-settings'