Disable generating release notes for beryllium

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

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 303d6e1d905853b2d46127812ac1e7e2bebfb588..f88c21a5013e60f22059c985d10f3db2eadadf82 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -129,6 +129,17 @@
       - shell: |
           ./scripts/fix-relativepaths.sh
 
+- builder:
+    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
+          fi
+
 - publisher:
     # include-raw-autorelease-notify-build-failure.sh searches console log for
     # failures and emails the status to the release mailing list.
@@ -147,7 +158,9 @@
       - postbuildscript:
           builders:
             - shell: |
-                # generate accounting summary
-                sudo LC_ALL=C /usr/lib64/sa/sa2 -A
                 mkdir -p archives/
                 cp /var/log/sa/* $_
+                # convert sar data to ascii format
+                sar -A -f /var/log/sa/sa$(date +%d) > archives/sar$(date +%d)
+          script-only-if-succeeded: false
+          script-only-if-failed: false