X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fglobal-templates-java.yaml;h=210ed9b829ac556c38f4124c92f58a7bfc094b15;hb=9f49e1f93d2510d4ca1c9bed8ece48bb3535a228;hp=6ccc2b491fd472426d864a469531cf88ee6f900d;hpb=a8e99e45b6bd106459e8f6a2c9608ad448ad07d5;p=ci-management.git

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 6ccc2b491..210ed9b82 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -327,7 +327,7 @@
 
     project-type: freestyle
     node: '{build-node}'
-    disabled: false
+    disabled: '{disabled}'
     maven-deploy-properties:
     properties:
       - infra-properties:
@@ -399,7 +399,7 @@
     name: '{project-name}-{stream}-release-java-daily-checkstyle'
     project-type: freestyle
     node: '{build-node}'
-    disabled: false
+    disabled: '{disabled}'
     maven-deploy-properties:
     properties:
       - infra-properties:
@@ -474,8 +474,8 @@
     name: '{project-name}-{stream}-release-version-java-daily'
 
     project-type: freestyle
+    disabled: '{disabled}'
     node: '{build-node}'
-    disabled: false
     maven-deploy-properties:
     properties:
       - infra-properties:
@@ -554,7 +554,7 @@
 
     project-type: freestyle
     node: '{build-node}'
-    disabled: false
+    disabled: '{disabled}'
     maven-deploy-properties:
     properties:
       - infra-properties:
@@ -636,7 +636,7 @@
 
     project-type: freestyle
     node: '{build-node}'
-    disabled: false
+    disabled: '{disabled}'
     maven-deploy-properties:
     properties:
       - infra-properties:
@@ -709,7 +709,7 @@
 
     project-type: freestyle
     node: '{build-node}'
-    disabled: false
+    disabled: '{disabled}'
     maven-deploy-properties:
     properties:
       - infra-properties:
@@ -776,6 +776,92 @@
       - 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 set versions
+    # 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}-{subproject}-release-version-java-shell-daily'
+
+    project-type: freestyle
+    node: '{build-node}'
+    disabled: '{disabled}'
+    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}'
+
+      - 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
+
+      - shell: '{script}'
+
+      - maven-target:
+          maven-version: '{maven-version}'
+          pom: '{pom}'
+          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}'
+          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
     #
@@ -1114,7 +1200,7 @@
     name: '{project-name}-{stream}-docker-java-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
-    disabled: false
+    disabled: '{disabled}'
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -1183,7 +1269,7 @@
     name: '{project-name}-{stream}-docker-java-properties-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
-    disabled: false
+    disabled: '{disabled}'
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -1256,7 +1342,7 @@
     name: '{project-name}-{stream}-docker-java-shell-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
-    disabled: false
+    disabled: '{disabled}'
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -1325,7 +1411,7 @@
     name: '{project-name}-{stream}-docker-java-version-shell-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
-    disabled: false
+    disabled: '{disabled}'
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -1409,7 +1495,7 @@
     name: '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
-    disabled: false
+    disabled: '{disabled}'
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -1494,7 +1580,7 @@
     name: '{project-name}-{stream}-docker-version-java-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
-    disabled: false
+    disabled: '{disabled}'
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -1575,7 +1661,7 @@
     name: '{project-name}-{stream}-{subproject}-docker-version-java-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
-    disabled: false
+    disabled: '{disabled}'
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -1657,7 +1743,7 @@
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
     docker-image-name: ''
-    disabled: false
+    disabled: '{disabled}'
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -1745,7 +1831,7 @@
     name: '{project-name}-{stream}-{subproject}-aai-docker-java-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
-    disabled: false
+    disabled: '{disabled}'
     docker-image-name: ''
 
     properties:
@@ -1837,7 +1923,7 @@
 
     project-type: freestyle
     node: '{build-node}'
-    disabled: false
+    disabled: '{disabled}'
     maven-deploy-properties:
     properties:
       - infra-properties:
@@ -1919,7 +2005,7 @@
 
     project-type: freestyle
     node: '{build-node}'
-    disabled: false
+    disabled: '{disabled}'
     maven-deploy-properties:
     properties:
       - infra-properties:
@@ -2004,7 +2090,7 @@
 
     project-type: freestyle
     node: '{build-node}'
-    disabled: false
+    disabled: '{disabled}'
     maven-deploy-properties:
     properties:
       - infra-properties:
@@ -2066,85 +2152,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
     #
@@ -2196,7 +2203,7 @@
 
       - docker-login
 
-      - maven-docker-push-daily:
+      - maven-docker-push-daily-test:
           maven-version: '{maven-version}'
           mvn-settings: '{mvn-settings}'
           pom: '{docker-pom}'
@@ -2222,7 +2229,7 @@
     name: '{project-name}-{stream}-aai-docker-java-version-daily'
     project-type: freestyle
     node: 'ubuntu1604-docker-8c-8g'
-    disabled: false
+    disabled: '{disabled}'
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'