Unify maven goal options some more

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

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 0239cb41103c0f9d6ea33190d43ab47e9900cd48..7ec714ee1ae0478144bcf53aac1131a8198e3cc0 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -9,19 +9,15 @@
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+        artifactDaysToKeep: '14'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - autorelease-release-tag:
-            release-tag: '{stream}-daily'
+            release-tag: '{next-release-tag}'
         - autorelease-release-branch:
             release-branch: '{branch}'
-        - autorelease-release-datestamp:
-            datestamp: true
 
     scm:
         - git:
@@ -33,6 +29,7 @@
             skip-tag: true
             submodule:
                 recursive: true
+                timeout: 60
 
     wrappers:
         - autorelease-build-timeout
@@ -44,21 +41,24 @@
         - timed: 'H 0 * * *'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
+        - wipe-local-maven-repo
         - jacoco-nojava-workaround
         - autorelease-cfp:
             autorelease-settings: '{autorelease-settings}'
             odl-global-settings: '{odl-global-settings}'
         - autorelease-generate-taglist
+        - autorelease-distribute-taglist
         - autorelease-generate-release-patches
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean deploy -Pintegrationtests,docs,repoBuild -Djenkins -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage'
+        goals: 'clean deploy -V -B -Pintegrationtests,docs,repoBuild -Djenkins -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage'
         maven-opts: '-Xmx10g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
         settings: '{autorelease-settings}'
+        settings-type: cfp
         global-settings: '{odl-global-settings}'
+        global-settings-type: cfp
         automatic-archiving: true
         post-step-run-condition: UNSTABLE
 
@@ -75,7 +75,7 @@
 
     publishers:
     - archive-artifacts:
-        artifacts: '*.prop,*.log,patches/*.patch,patches/*.log'
+        artifacts: '*.prop,*.log,patches/*.bundle,patches/*.patch,patches/*.log'
     - email-notification:
         email-prefix: '[autorelease]'
     - trigger-parameterized-builds:
@@ -84,114 +84,6 @@
           property-file: variables.prop
           fail-on-missing: true
 
-- job-template:
-    name: 'autorelease-release-test-{stream}'
-
-    project-type: maven
-    node: dynamic_autorelease
-    jdk: '{jdk}'
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - autorelease-release-tag:
-            release-tag: '{stream}-daily'
-        - autorelease-release-branch:
-            release-branch: '{branch}'
-        - autorelease-release-datestamp:
-            datestamp: true
-
-    scm:
-        - git:
-            credentials-id: '{ssh-credentials}'
-            url: '$GIT_BASE'
-            refspec: ''
-            branches:
-                - 'origin/{branch}'
-            skip-tag: true
-            submodule:
-                recursive: true
-
-    wrappers:
-        - autorelease-build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
-    # triggers:
-    #     - timed: 'H 0 * * *'
-
-    prebuilders:
-        - wipe-org-opendaylight-repo
-        - jacoco-nojava-workaround
-        - autorelease-cfp:
-            autorelease-settings: '{autorelease-settings}'
-            odl-global-settings: '{odl-global-settings}'
-        - autorelease-generate-taglist
-        - autorelease-generate-release-patches
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: 'clean deploy -Pintegrationtests,docs,repoBuild,offset0 -Djenkins -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage'
-        maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-        settings: '{autorelease-settings}'
-        global-settings: '{odl-global-settings}'
-        automatic-archiving: true
-        post-step-run-condition: UNSTABLE
-
-    postbuilders:
-        - maven-target:
-            maven-version: '{mvn33}'
-            pom: 'pom.xml'
-            goals: 'clean deploy -Pintegrationtests,docs,repoBuild,offset1 -Djenkins -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage'
-            java-opts:
-                - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-            settings: '{autorelease-settings}'
-            global-settings: '{odl-global-settings}'
-        - maven-target:
-            maven-version: '{mvn33}'
-            pom: 'pom.xml'
-            goals: 'clean deploy -Pintegrationtests,docs,repoBuild,offset2 -Djenkins -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage'
-            java-opts:
-                - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-            settings: '{autorelease-settings}'
-            global-settings: '{odl-global-settings}'
-        - maven-target:
-            maven-version: '{mvn33}'
-            pom: 'pom.xml'
-            goals: 'clean deploy -Pintegrationtests,docs,repoBuild,offset3 -Djenkins -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage'
-            java-opts:
-                - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-            settings: '{autorelease-settings}'
-            global-settings: '{odl-global-settings}'
-        - autorelease-maven-deploy
-        - shell: "./scripts/list-project-dependencies.sh"
-        - autorelease-get-integration-test-variables
-        - autorelease-maven-sources:
-            maven-version: '{mvn33}'
-            settings: '{autorelease-settings}'
-            global-settings: '{odl-global-settings}'
-        - autorelease-maven-sources-post-process
-        - autorelease-sys-stats
-
-    publishers:
-    - archive-artifacts:
-        artifacts: '*.prop,*.log,patches/*.patch,patches/*.log'
-    - email-notification:
-        email-prefix: '[autorelease]'
-    # - trigger-parameterized-builds:
-    #     - project: 'integration-distribution-test-{integration-test}'
-    #       condition: UNSTABLE_OR_BETTER
-    #       property-file: variables.prop
-    #       fail-on-missing: true
-
 - job-template:
     name: 'autorelease-project-report-{stream}'
 
@@ -283,8 +175,10 @@
     parameters:
     - project-parameter:
         project: '{project}'
-    - gerrit-parameter:
+    - gerrit-parameters:
+        project: '{project}'
         branch: '{branch}'
+        refspec: 'refs/heads/{branch}'
 
     scm:
     - gerrit-trigger-scm:
@@ -308,7 +202,9 @@
         goals: 'site:site site:deploy -Dstream={stream}'
         maven-opts: '-Xmx1024m'
         settings: '{autorelease-settings}'
+        settings-type: cfp
         global-settings: '{odl-global-settings}'
+        global-settings-type: cfp
 
     publishers:
     - email-notification:
@@ -333,8 +229,10 @@
     parameters:
     - project-parameter:
         project: '{project}'
-    - gerrit-parameter:
+    - gerrit-parameters:
+        project: '{project}'
         branch: '{branch}'
+        refspec: 'refs/heads/{branch}'
 
     scm:
     - gerrit-trigger-scm:
@@ -358,7 +256,9 @@
         goals: 'site:site -Dstream={stream}'
         maven-opts: '-Xmx1024m'
         settings: '{autorelease-settings}'
+        settings-type: cfp
         global-settings: '{odl-global-settings}'
+        global-settings-type: cfp
 
     publishers:
         - email-notification: