Add new project section for release notes

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

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 5275b52aa1eac321a1862cf40dd9fcdc2dd6e32a..0d85280568111b5ab66e67646f11f18d5133230b 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -133,11 +133,11 @@
     name: autorelease-generate-release-notes
     builders:
       - shell: |
-          # TODO: Remove this condition once stable/beryllium is no longer
-          #       officially maintained.
-          if [ "$GERRIT_BRANCH" != "stable/beryllium" ]; then
-              cd $WORKSPACE/scripts/release_notes_management
-              java -jar target/autonotes.jar
+          cd $WORKSPACE/scripts/release_notes_management
+          java -jar target/autonotes.jar
+          if [ -f  "$WORKSPACE/scripts/release_notes_management/projects/release-notes.rst" ]; then
+              mkdir -p $WORKSPACE/archives
+              cp -vf "$WORKSPACE/scripts/release_notes_management/projects/release-notes.rst" "$WORKSPACE/archives"
           fi
 
 - publisher:
@@ -157,13 +157,6 @@
     publishers:
       - postbuildscript:
           builders:
-            - shell: |
-                mkdir -p archives/
-                cp /var/log/sa/* $_
-                # convert sar data to ascii format
-                while IFS="" read -r s
-                do
-                    [ -f "$s" ] && sar -A -f "$s" > archives/sar/sar${s//[!0-9]/}
-                done < <(find /var/log/{sa,sysstat} -name "sa[0-9]*")
+            - shell: !include-raw: include-raw-autorelease-collect-sar.sh
           script-only-if-succeeded: false
           script-only-if-failed: false