X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-templates-java.yaml;h=0eff4f9c51762ae81543124daa745dc040c30d60;hb=a70a6aa4295a49f2fa018deed83db572e70d393e;hp=cc23be0219e43d6e2451f63c5aef9bade1e4d71d;hpb=24ff05d7dd16173ea8b913cd9a1afe7f004770ac;p=releng%2Fbuilder.git

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index cc23be021..0eff4f9c5 100644
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -39,7 +39,7 @@
 
     builders:
       - provide-maven-settings:
-          global-settings-file: 'odl-global-settings'
+          global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - maven-target:
           maven-version: 'mvn33'
@@ -52,7 +52,7 @@
             - '-Xmx4096m -XX:MaxPermSize=512m'
           settings: '{mvn-settings}'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - shell: 'find . -regex ".*karaf/target" | xargs rm -rf'
       - check-clm:
@@ -62,92 +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}'
-
-    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'
-      - distribution-check-verify-groupid:
-          gerrit-project: '$GERRIT_PROJECT'
-      - distribution-check-download-deps:
-          dist-pom: 'distribution/pom.xml'
-      - distribution-check-delete-snapshots
-      - distribution-check-configure-remotes
-      - distribution-check-repeat-build:
-          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
-      - archive:
-          artifacts: '*.zip'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: '{project-name}-integration-{stream}'
@@ -195,7 +110,7 @@
     builders:
       - jacoco-nojava-workaround
       - provide-maven-settings:
-          global-settings-file: 'odl-global-settings'
+          global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - maven-target:
           maven-version: 'mvn33'
@@ -206,7 +121,7 @@
             - '{mvn-opts}'
           settings: '{mvn-settings}'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
 
     publishers:
@@ -215,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}'
@@ -249,6 +163,10 @@
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
+      - string:
+          name: STREAM
+          default: '{stream}'
+          description: "String representing release name"
 
     scm:
       - gerrit-trigger-scm:
@@ -269,13 +187,13 @@
     prebuilders:
       - jacoco-nojava-workaround
       - provide-maven-settings:
-          global-settings-file: 'odl-global-settings'
+          global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
 
     # TODO: Do we want to apply sophisticated checks as in *-distribution-check-*?
     maven:
       maven-name: 'mvn33'
-      goals: |
+      goals: >
           {mvn-goals}
           -Dmerge
           -Dstream={stream}
@@ -283,7 +201,7 @@
       maven-opts: '{mvn-opts}'
       settings: '{mvn-settings}'
       settings-type: cfp
-      global-settings: 'odl-global-settings'
+      global-settings: 'global-settings'
       global-settings-type: cfp
       post-step-run-condition: UNSTABLE
 
@@ -308,18 +226,10 @@
                   - '-Xmx2g'
                 settings: '{mvn-settings}'
                 settings-type: cfp
-                global-settings: 'odl-global-settings'
-                global-settings-type: cfp
-            - maven-target:
-                maven-version: 'mvn33'
-                pom: deploy-site.xml
-                goals: 'site:deploy -V -B -Dstream={stream}'
-                java-opts:
-                  - '-Xmx2g'
-                settings: '{mvn-settings}'
-                settings-type: cfp
-                global-settings: 'odl-global-settings'
+                global-settings: 'global-settings'
                 global-settings-type: cfp
+            - opendaylight-infra-deploy-maven-site:
+                settings-file: '{mvn-settings}'
 
     reporters:
       - findbugs
@@ -333,8 +243,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
@@ -378,7 +287,7 @@
     builders:
       - jacoco-nojava-workaround
       - provide-maven-settings:
-          global-settings-file: 'odl-global-settings'
+          global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - maven-target:
           maven-version: 'mvn33'
@@ -390,7 +299,7 @@
             - '{mvn-opts}'
           settings: '{mvn-settings}'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - maven-target:
           maven-version: 'mvn33'
@@ -406,7 +315,7 @@
             - '{mvn-opts}'
           settings: '{mvn-settings}'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
 
     publishers:
@@ -415,105 +324,7 @@
           email-prefix: '[{project-name}]'
       - jacoco-report
       - findbugs
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
-
-- job-template:
-    name: '{project-name}-validate-autorelease-{stream}'
-    disabled: false
-
-    project-type: freestyle
-    node: '{build-node}'
-    concurrent: true
-    jdk: '{jdk}'
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 7
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - autorelease-release-tag:
-          release-tag: 'validate'
-      - autorelease-release-branch:
-          release-branch: '{branch}'
-      - string:
-          name: CLONE_URL
-          default: '{git-url}/releng/autorelease'
-          description: "Autorelease clone URL"
-
-    scm:
-      - git:
-          url: '$CLONE_URL'
-          credentials-id: 'opendaylight-jenkins-ssh'
-          refspec: ''
-          branches:
-            - 'origin/{branch}'
-          skip-tag: true
-          submodule:
-            recursive: true
-            timeout: 60
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**/*.xml'
-
-    builders:
-      - jacoco-nojava-workaround
-      - autorelease-checkout-gerrit-patch
-      - autorelease-generate-release-patches
-      # In a perfect world projects should be releasing separately and we consume them
-      # via a project that pulls the release bits from each project from Nexus.
-      # Keep the patches compatible with that ideal, but apply an edit
-      # to enable building in a single maven reactor afterwards.
-      - autorelease-fix-relative-paths
-      - maven-target:
-          maven-version: 'mvn33'
-          pom: validate-pom.xml
-          goals: |
-              clean install dependency:tree
-              -T1.5C
-              -Pq
-              {opendaylight-infra-mvn-opts}
-          java-opts:
-            - '-Xmx8g'
-          settings: 'autorelease-settings'
-          settings-type: cfp
-          global-settings: 'odl-global-settings'
-          global-settings-type: cfp
-      - maven-target:
-          maven-version: 'mvn33'
-          pom: 'pom.xml'
-          goals: |
-              clean validate
-              -Pq
-              {opendaylight-infra-mvn-opts}
-          java-opts:
-            - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-          settings: 'autorelease-settings'
-          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}'
@@ -562,7 +373,7 @@
     builders:
       - jacoco-nojava-workaround
       - provide-maven-settings:
-          global-settings-file: 'odl-global-settings'
+          global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - maven-target:
           maven-version: '{mvn-version}'
@@ -574,7 +385,7 @@
             - '{mvn-opts}'
           settings: '{mvn-settings}'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
 
     publishers:
@@ -583,5 +394,4 @@
           email-recipients: '{email-recipients}'
           email-prefix: '[{project-name}]'
       - jacoco-report
-      - opendaylight-infra-shiplogs:
-          maven-version: '{mvn-version}'
+      - lf-infra-publish