X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fsysstat.sh;h=eada1b35994b9181a21a98284ae30fd96430ae6f;hb=b9b982379e3df32c324b0794f95670847ac8c3d4;hp=5b496259cf0d3af5da636f7ea744c2d752f4907d;hpb=abe6684e878d921a63c8efde4164c27ca59985be;p=releng%2Fglobal-jjb.git

diff --git a/shell/sysstat.sh b/shell/sysstat.sh
index 5b496259..eada1b35 100644
--- a/shell/sysstat.sh
+++ b/shell/sysstat.sh
@@ -11,19 +11,24 @@
 echo "---> sysstat.sh"
 set +e  # DON'T fail build if script fails.
 
+if awk -F/ '$2 == "docker"' /proc/self/cgroup | read -r; then
+    exit 0
+fi
+
+
 OS=$(facter operatingsystem)
 case "$OS" in
     Ubuntu)
         os_release=$(facter operatingsystemrelease)
         case $os_release in
-            16.04|18.04)
+            16.04|18.04|20.04)
                 if ! systemctl status sysstat > /dev/null; then
                     exit 0
                 fi
                 ;;
             14.04)
-                if [[ ! -f /etc/default/sysstat ]] ||
-                      ! grep --quiet 'ENABLED="true"' /etc/default/sysstat; then
+                if [[ ! -f /etc/default/sysstat ]] || \
+                        ! grep --quiet 'ENABLED="true"' /etc/default/sysstat; then
                     exit 0
                 fi
                 ;;
@@ -47,8 +52,7 @@ SAR_DIR="$WORKSPACE/archives/sar-reports"
 mkdir -p "$SAR_DIR"
 cp "$SYSSTAT_PATH/"* "$_"
 # convert sar data to ascii format
-while IFS="" read -r sarfilenum
-do
+while IFS="" read -r sarfilenum; do
     [ -f "$sarfilenum" ] && LC_TIME=POSIX sar -A -f "$sarfilenum" > "$SAR_DIR/sar${sarfilenum//[!0-9]/}"
 done < <(find "$SYSSTAT_PATH" -name "sa[0-9]*" || true)