Merge "Update zrpcd repository to build latest changes"

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index f88c21a5013e60f22059c985d10f3db2eadadf82..5275b52aa1eac321a1862cf40dd9fcdc2dd6e32a 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -161,6 +161,9 @@
                 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)
+                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]*")
           script-only-if-succeeded: false
           script-only-if-failed: false

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index 6502bc4e9bf87ad300cee6cb1febbec2d4928951..dfdeebce7c3b6618b46ff89618e5344b6d6d2985 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -6,8 +6,7 @@
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      # TODO uncomment the below line once lacp is added back to Carbon
-      # - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen