Remove archive release notes on Jenkins

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

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 86346cec0d04ffce59367c7c5bf569f811503d64..7b6b0e2046808b4d59cc9ad561530ef71a782453 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -133,8 +133,16 @@
     name: autorelease-generate-release-notes
     builders:
       - shell: |
-          cd $WORKSPACE/scripts/release_notes_management
-          java -jar target/autonotes.jar
+          # 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
+              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
+          fi
 
 - publisher:
     # include-raw-autorelease-notify-build-failure.sh searches console log for
@@ -153,13 +161,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