X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fglobal-templates-java.yaml;h=f9da82c7996e5e06b80a3d1f6993030957c8b5c4;hb=ac603ba604e4ffa9eed4806a4f95e8f41b9d2c27;hp=bcf4bd3bb54b4b761adcb1e94e14ba70fdf5a53f;hpb=711f7c7743b06e776407637798153f473f8cf6ad;p=ci-management.git

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index bcf4bd3bb..f9da82c79 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -75,8 +75,7 @@
           global-settings-type: cfp
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for Java verify jobs running checkstyle at the end
@@ -93,9 +92,9 @@
 
     <<: *verify_java_defaults
     name: '{project-name}-{stream}-verify-java-checkstyle'
+
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
       - checkstyle-result
 
 - job-template:
@@ -134,75 +133,6 @@
           branch: '{branch}'
           files: '{obj:pattern}'
 
-- job-template:
-    # Job template for Java daily release jobs
-    #
-    # The purpose of this job template is to run:
-    # 1. maven clean deploy with Sonar scans
-    #
-    # Required Variables:
-    #     branch:    git branch (eg. stable/lithium or master)
-
-    name: '{project-name}-{stream}-release-java-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: '@daily'
-      - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - lf-infra-pre-build
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-
-      - maven-target:
-          maven-version: '{maven-version}'
-          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'
-          global-settings-type: cfp
-
-    publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
-
 - job-template:
     # Job template for Java daily release jobs running checkstyle at the end
     # When checkstyle will be fully incorporated, it is meant to replace
@@ -220,7 +150,7 @@
     name: '{project-name}-{stream}-release-java-daily-checkstyle'
     project-type: freestyle
     node: '{build-node}'
-    disabled: '{disabled}'
+    disabled: false
     maven-deploy-properties:
     properties:
       - infra-properties:
@@ -273,9 +203,9 @@
           settings-type: cfp
           global-settings: 'global-settings'
           global-settings-type: cfp
+
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
       - checkstyle-result-daily
 
 - job-template:
@@ -291,7 +221,7 @@
     name: '{project-name}-{stream}-release-version-java-daily'
 
     project-type: freestyle
-    disabled: '{disabled}'
+    disabled: false
     node: '{build-node}'
     maven-deploy-properties:
     properties:
@@ -350,8 +280,7 @@
           global-settings-type: cfp
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template: &merge_java_defaults
     # Job template for Java merge jobs
@@ -394,8 +323,9 @@
           submodule-recursive: '{submodule-recursive}'
 
     wrappers:
-      - infra-wrappers:
+      - lf-infra-wrappers:
           build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers:
       - gerrit-trigger-patch-merged:
@@ -433,8 +363,7 @@
           properties: '{obj:mvn_properties}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for Java merge jobs based on
@@ -451,6 +380,11 @@
     <<: *merge_java_defaults
     name: '{project-name}-{stream}-merge-properties-java'
 
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
 - job-template:
     # Job template for Java merge jobs that takes a maven template
     #
@@ -514,7 +448,8 @@
     id: '{project-name}-{stream}-docker-java-daily'
     project-type: freestyle
     node: '{build-node}'
-    disabled: '{disabled}'
+    disabled: false
+    java-version: openjdk8
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -550,6 +485,9 @@
 
     builders:
       - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
+
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -565,8 +503,7 @@
           mvn-params: '{mvn-params}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for Docker daily jobs
@@ -600,7 +537,7 @@
     name: '{project-name}-{stream}-docker-java-shell-daily'
     project-type: freestyle
     node: '{build-node}'
-    disabled: '{disabled}'
+    disabled: false
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -651,8 +588,7 @@
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for building & pushing docker images
@@ -668,7 +604,7 @@
     name: '{project-name}-{stream}-{subproject}-docker-java-shell-daily'
     project-type: freestyle
     node: '{build-node}'
-    disabled: '{disabled}'
+    disabled: false
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -720,8 +656,7 @@
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for building & pushing docker images
@@ -738,7 +673,7 @@
     name: '{project-name}-{stream}-docker-java-version-shell-daily'
     project-type: freestyle
     node: '{build-node}'
-    disabled: '{disabled}'
+    disabled: false
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -796,8 +731,7 @@
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for building & pushing docker images
@@ -815,8 +749,8 @@
 
     name: '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily'
     project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
-    disabled: '{disabled}'
+    node: 'ubuntu1804-docker-8c-8g'
+    disabled: false
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -875,8 +809,7 @@
       - shell: '{script}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template: &docker_version_java_defaults
     # Job template for building & pushing docker images
@@ -895,7 +828,7 @@
     id: '{project-name}-{stream}-docker-version-java-daily'
     project-type: freestyle
     node: '{build-node}'
-    disabled: '{disabled}'
+    disabled: false
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -953,8 +886,7 @@
           mvn-params: '{mvn-params}'
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for building & pushing docker images
@@ -993,7 +925,8 @@
     project-type: freestyle
     node: '{build-node}'
     docker-image-name: ''
-    disabled: '{disabled}'
+    disabled: false
+    java-version: 'openjdk8'
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -1029,6 +962,8 @@
 
     builders:
       - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -1061,8 +996,7 @@
       - shell: !include-raw-escape: include-docker-push.sh
 
     publishers:
-      - infra-shiplogs:
-          maven-version: '{maven-version}'
+      - lf-infra-publish
 
 - job-template:
     # Job template for Java merge jobs for SDC specific repos
@@ -1081,6 +1015,8 @@
 
     builders:
       - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'