X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-templates-java.yaml;h=adda3abdc43fa82c0761d7ba206c1eddc4db0114;hb=d51b349beb2eab289500e77f4387acdd408d300e;hp=2db2ec9ae143192a4ee88544bed616fb76daa628;hpb=fdbeaaa2b84b076e3ecd057ef827d0bb191f507e;p=releng%2Fbuilder.git

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 2db2ec9ae..adda3abdc 100644
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -62,98 +62,7 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project-name}]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
-
-- job-template:
-    # Template: {project-name}-distribution-check-{stream}
-    # Goal: Build a patch and make sure the distribution can deploy with this change.
-    # Operation: This job template builds a patch, creates a distribution containing
-    #            the patch (making sure dependencies are specified),
-    #            and performs the distribution deploy test.
-
-    name: '{project-name}-distribution-check-{stream}'
-    disabled: false
-
-    project-type: freestyle
-    node: '{build-node}'
-    concurrent: true
-    jdk: '{jdk}'
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt'
-      - integration-distribution-git-url:
-          git-url: '{git-url}'
-      - maven-exec:
-          maven-version: mvn33
-
-    scm:
-      - integration-gerrit-scm:
-          basedir: '$GERRIT_PROJECT'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '{branch}'
-      - integration-distribution-scm:
-          branch: '{distribution_branch}'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          # Distro-check jobs typically run within 10 - 30 minutes
-          # with 45 minutes being the occassional edge case.
-          # enforce a 60 minute limit to ensure stuck jobs get
-          # cleared up sooner.
-          build-timeout: '60'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
-
-    builders:
-      - distribution-check-wipe
-      - distribution-check-build-project:
-          pom: '$GERRIT_PROJECT/pom.xml'
-          mvn-opts: '{opendaylight-infra-mvn-opts}'
-      - distribution-check-verify-groupid:
-          gerrit-project: '$GERRIT_PROJECT'
-      - distribution-check-download-deps:
-          dist-pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-mvn-opts}'
-      - distribution-check-delete-snapshots
-      - distribution-check-configure-remotes
-      - distribution-check-repeat-build:
-          dist-pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-mvn-opts}'
-      - distribution-check-deploy-distribution:
-          dist-pom: distribution/pom.xml
-      - integration-distribution-check
-
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project-name}]'
-      - postbuildscript:
-          builders:
-            - shell: |
-                #!/bin/bash
-                mkdir -p $WORKSPACE/archives
-                cp karaf*.log $WORKSPACE/archives
-          script-only-if-succeeded: false
-          script-only-if-failed: false
-          mark-unstable-if-failed: true
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: '{project-name}-integration-{stream}'
@@ -221,8 +130,7 @@
           email-prefix: '{email-upstream}'
       - findbugs
       - jacoco-report
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: '{project-name}-merge-{stream}'
@@ -339,8 +247,7 @@
           unique-version: true
           deploy-unstable: false
       - jacoco-report
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
       - trigger:
           project: 'distribution-merge-{stream}'
           threshold: SUCCESS
@@ -421,8 +328,7 @@
           email-prefix: '[{project-name}]'
       - jacoco-report
       - findbugs
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: '{project-name}-validate-autorelease-{stream}'
@@ -512,14 +418,12 @@
           settings-type: cfp
           global-settings: 'odl-global-settings'
           global-settings-type: cfp
-      - autorelease-sys-stats
 
     publishers:
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[autorelease] [{project-name}]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -589,5 +493,4 @@
           email-recipients: '{email-recipients}'
           email-prefix: '[{project-name}]'
       - jacoco-report
-      - opendaylight-infra-shiplogs:
-          maven-version: '{mvn-version}'
+      - lf-infra-publish