X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fautorelease-templates.yaml;h=bc2591b757c77fdaf94c407cbb1e5186b3e3b154;hb=106d9e8c2195a8d682ced3754398c2f517268cdb;hp=148b6b1eb894e7eb3bcc8abcc78bcc8f2a35b1f1;hpb=2091dd357bf42105974dbe11f4b98115152a6ccb;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 148b6b1eb..bc2591b75 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
@@ -17,7 +17,7 @@
         - project-parameter:
             project: '{project}'
         - autorelease-release-tag:
-            release-tag: 'Daily'
+            release-tag: '{stream}-daily'
         - autorelease-release-branch:
             release-branch: '{branch}'
         - autorelease-release-datestamp:
@@ -46,21 +46,26 @@
     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 install -Pintegrationtests,docs,repoBuild -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        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'
         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}'
@@ -69,18 +74,21 @@
         - 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-project-report-{stream}'
 
-    project-type: maven
-    node: dynamic_autorelease
-    jdk: '{jdk}'
+    project-type: freestyle
+    node: dynamic_verify
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -91,12 +99,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - autorelease-release-tag:
-            release-tag: 'Test-{stream}'
-        - autorelease-release-branch:
-            release-branch: '{branch}'
-        - autorelease-release-datestamp:
-            datestamp: false
+        - string:
+            name: REPORT_DIR
+            default: '$WORKSPACE/project-reports'
+            description: "The directory containing project reports"
 
     scm:
         - git:
@@ -110,51 +116,41 @@
                 recursive: true
 
     wrappers:
-        - autorelease-build-timeout
+        - timeout:
+            type: absolute
+            timeout: 30
+            fail: true
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
 
-    prebuilders:
-        - wipe-org-opendaylight-repo
-        - jacoco-nojava-workaround
-        - autorelease-generate-taglist
-        - autorelease-generate-release-patches
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: 'clean install -Pintegrationtests,docs,repoBuild -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'
-        settings: '{autorelease-settings}'
-        global-settings: '{odl-global-settings}'
-        automatic-archiving: true
-        post-step-run-condition: UNSTABLE
+    triggers:
+        - timed: '0 0 * * 0'
 
-    postbuilders:
-        - autorelease-cfp:
-            autorelease-settings: '{autorelease-settings}'
-            odl-global-settings: '{odl-global-settings}'
-        - autorelease-maven-deploy
+    builders:
+        - shell: 'echo "DATE=`date +%Y-%m-%d`" > $WORKSPACE/variables.prop'
+        - inject:
+            properties-file: variables.prop
+        - autorelease-generate-project-report
         - 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'
-    - 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
+        artifacts: '*.log,project-reports/*.log'
+    - email-ext:
+        attachments: 'project-reports/*.log'
+        recipients: 'skitt@redhat.com thanh.ha@linuxfoundation.org'
+        reply-to: dev@lists.opendaylight.org
+        content-type: default
+        subject: '[releng] ODL {stream} project report for ${{ENV, var="DATE"}}'
+        body: |
+            This is a project report generated on $DATE listing the commit
+            history of ODL projects for the past week. See attached
+            git-report.log
+
+            Archive also available on Jenkins at $BUILD_URL
+        always: true
 
 ###
 ### Maven Sites
@@ -194,7 +190,7 @@
         - '{ssh-credentials}'
 
     triggers:
-    - gerrit-trigger-patch-site-merged:
+    - autorelease-trigger-patch-site-merged:
         name: '{project}'
         branch: '{branch}'
 
@@ -203,7 +199,7 @@
         root-pom: 'site.xml'
         goals: 'site:site site:deploy -Dstream={stream}'
         maven-opts: '-Xmx1024m'
-        settings: '{releng-builder-settings}'
+        settings: '{autorelease-settings}'
         global-settings: '{odl-global-settings}'
 
     publishers:
@@ -244,7 +240,7 @@
         - '{ssh-credentials}'
 
     triggers:
-    - gerrit-trigger-patch-submitted:
+    - autorelease-trigger-patch-site-submitted:
         name: '{project}'
         branch: '{branch}'