Merge "Revert "Add refspec to validate-autorelease job""

[releng/builder.git] / jjb / releng-templates-java.yaml

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 80783eaa287c1143d882bce5f7d8d5f1d263c2ef..3cd9c2cb82d95ff68387785d2840e66dca6961d6 100644 (file)
--- 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,8 +62,7 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project-name}]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 - job-template:
     name: '{project-name}-integration-{stream}'
@@ -111,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'
@@ -122,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:
@@ -131,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}'
@@ -165,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:
@@ -185,7 +187,7 @@
     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-*?
@@ -199,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
 
@@ -224,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
@@ -249,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
@@ -294,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'
@@ -306,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'
@@ -322,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:
@@ -331,8 +324,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}'
@@ -407,7 +399,7 @@
             - '-Xmx8g'
           settings: 'autorelease-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - maven-target:
           maven-version: 'mvn33'
@@ -420,15 +412,14 @@
             - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
           settings: 'autorelease-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
 
     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}'
@@ -477,7 +468,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}'
@@ -489,7 +480,7 @@
             - '{mvn-opts}'
           settings: '{mvn-settings}'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
 
     publishers:
@@ -498,5 +489,4 @@
           email-recipients: '{email-recipients}'
           email-prefix: '[{project-name}]'
       - jacoco-report
-      - opendaylight-infra-shiplogs:
-          maven-version: '{mvn-version}'
+      - lf-infra-publish