X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fautorelease%2Fautorelease-templates.yaml;h=adfd78183aab91a51503c5acdb9dc763c1b8063f;hb=3ff3ac69958a18a669943e1855e4e2e80738bb73;hp=e5c30d28aa04239c5efcba6539fc586746c9d7e7;hpb=77070e6c24cd962353e9e9d6a9c502e36ae359bf;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index e5c30d28a..adfd78183 100644
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -1,7 +1,7 @@
 # Autorelease build jobs
 
 - job-template:
-    name: 'autorelease-daily-{stream}'
+    name: 'autorelease-release-{stream}'
 
     project-type: maven
     node: dynamic_autorelease
@@ -10,14 +10,14 @@
     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'
+        artifactNumToKeep: '-1'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - autorelease-release-tag:
-            release-tag: 'Daily'
+            release-tag: '{stream}-daily'
         - autorelease-release-branch:
             release-branch: '{branch}'
         - autorelease-release-datestamp:
@@ -46,24 +46,26 @@
     prebuilders:
         - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
-        - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{autorelease-settings}'
+        - 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 install -Pintegrationtests,docs,repoBuild -Djenkins -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+        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'
+        maven-opts: '-Xmx10g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
         settings: '{autorelease-settings}'
         global-settings: '{odl-global-settings}'
-        automatic-archiving: false
+        automatic-archiving: true
         post-step-run-condition: UNSTABLE
 
     postbuilders:
+        - autorelease-maven-deploy
         - shell: "./scripts/list-project-dependencies.sh"
+        - autorelease-get-integration-test-variables
         - autorelease-maven-sources:
             maven-version: '{mvn33}'
             settings: '{autorelease-settings}'
@@ -72,14 +74,18 @@
         - autorelease-sys-stats
 
     publishers:
-        - archive-artifacts:
-            artifacts: '*.log,patches/*.patch'
-        - email-notification:
-            email-prefix: '[autorelease]'
-
+    - 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-release-{stream}'
+    name: 'autorelease-release-test-{stream}'
 
     project-type: maven
     node: dynamic_autorelease
@@ -95,11 +101,11 @@
         - project-parameter:
             project: '{project}'
         - autorelease-release-tag:
-            release-tag: 'Test-{stream}'
+            release-tag: '{stream}-daily'
         - autorelease-release-branch:
             release-branch: '{branch}'
         - autorelease-release-datestamp:
-            datestamp: false
+            datestamp: true
 
     scm:
         - git:
@@ -118,6 +124,9 @@
             users:
                 - '{ssh-credentials}'
 
+    # triggers:
+    #     - timed: 'H 0 * * *'
+
     prebuilders:
         - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
@@ -130,7 +139,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -Pintegrationtests,docs,repoBuild -Djenkins -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        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}'
@@ -138,6 +147,30 @@
         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
@@ -150,14 +183,14 @@
 
     publishers:
     - archive-artifacts:
-        artifacts: '*.prop,*.log,patches/*.patch'
+        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
+    # - 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}'