Chore: Upgrade Jenkins-job-builder to 6.3.0

[releng/global-jjb.git] / shell / sysstat.sh

diff --git a/shell/sysstat.sh b/shell/sysstat.sh
index c72e23a..eada1b3 100644 (file)
--- 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
+                        ! grep --quiet 'ENABLED="true"' /etc/default/sysstat; then
                     exit 0
                 fi
                 ;;