Merge ~canonical-kernel-team/+git/autotest-client-tests:ubuntu_stress_smoke_split_check_machine into ~canonical-kernel-team/+git/autotest-client-tests:master

[Paolo Pisati]

Split check_machine() into its own separate script, and move it a the beginning of the call chain.

While here fix return code.

[Po-Hsu Lin (cypressyew)]

Hi Paolo,

thanks for the enhancement, please find inline comments.

review: Needs Fixing

[Andrei Gherzan (agherzan)]

Looks good generally, but we could fix some small things with this refactoring.

review: Approve

[Po-Hsu Lin (cypressyew)]

Thanks!
I will take this updated version and make follow-ups to make sure tests can be skipped when the setup-check fails.

review: Approve

[Po-Hsu Lin (cypressyew)]

Applied and pushed.

[Po-Hsu Lin (cypressyew)]

Here is the follow-up MR:
https://code.launchpad.net/~canonical-kernel-team/+git/autotest-client-tests/+merge/457663

Actual test result can be found here.
http://10.246.72.4:8080/view/all/job/xenial-linux-lowlatency-amd64-4.4.0-onibi-ubuntu_stress_smoke_test/6/

diff --git a/ubuntu_stress_smoke_test/control b/ubuntu_stress_smoke_test/control
index 394b9f9..319f4c1 100644
--- a/ubuntu_stress_smoke_test/control
+++ b/ubuntu_stress_smoke_test/control
@@ -49,9 +49,9 @@ if flavour == 'kvm':
     exclude.append('dnotify')
 
 
-test_dir = os.path.join(job.bindir, 'tests', NAME)
-cmd = '%s/ubuntu_stress_smoke_test_init.sh' % (test_dir)
-utils.system_output(cmd, retain_output=True)
+job.run_test_detail(NAME, test_name='setup-check' , tag='setup-check', timeout=35*60)
+
+job.run_test_detail(NAME, test_name='setup-init' , tag='setup-init', timeout=35*60)
 
 result = job.run_test_detail(NAME, test_name='setup', tag='setup', timeout=60*60)
 if result == 'GOOD':
diff --git a/ubuntu_stress_smoke_test/ubuntu_stress_single_smoke_test.sh b/ubuntu_stress_smoke_test/ubuntu_stress_single_smoke_test.sh
index 5ba3f9d..aa9b2d9 100755
--- a/ubuntu_stress_smoke_test/ubuntu_stress_single_smoke_test.sh
+++ b/ubuntu_stress_smoke_test/ubuntu_stress_single_smoke_test.sh
@@ -3,12 +3,6 @@
 [ $# -lt 1 ] && echo "$0 requires STRESSOR name to be run" && exit 1
 STRESSOR=${1}
 
-# Maximum machine age in years
-MAX_AGE=5
-# minimum required memory in MB
-MIN_MEM=$((3 * 1024))
-# minimum free disk required in GB
-MIN_DISK=$((4))
 # maximum bogo ops per stressor
 MAX_BOGO_OPS=3000
 
@@ -66,91 +60,11 @@ STRESS_OPTIONS="--ignite-cpu --syslog --verbose --verify --oomable"
 rc=0
 TMP_FILE=/tmp/stress-$$.log
 
-check_message()
-{
-	echo "NOTE: $1, skipping test"
-}
-
-check_machine()
-{
-	hostname=$(hostname)
-	processor=$(uname -p)
-	skip=0
-	case "$processor" in
-	i386 | i486 | i586 | i686 | x86_64)
-		datecheck=1
-
-		manufacturer=$(dmidecode -s system-manufacturer)
-		if [ "$manufacturer" == "QEMU" ]; then
-			echo "QEMU instance, no firmware date checking"
-			datecheck=0
-		fi
-
-		vendor=$(dmidecode -t 0x0000 | grep Vendor: | awk '{ print $2}')
-		if [ -z "$vendor" ]; then
-			vendor=$(dmidecode -t 0x000e | grep Vendor: | awk '{ print $2}')
-		fi
-
-		case "$vendor" in
-		unknown | Unknown)
-			check_message "Unknown BIOS vendor, ignoring machine"
-			skip=1
-			datecheck=0
-			;;
-		SeaBIOS)
-			echo "SeaBIOS BIOS, using a VM, no date checking"
-			datecheck=0
-			;;
-		*)
-			;;
-		esac
-
-		if [ $datecheck -eq 1 ]; then
-			year=$(date +%Y)
-			year=$((year - $MAX_AGE))
-			date=$(dmidecode -t 0x0000 | grep "Release Date:" | cut -d'/' -f3)
-			if [ -z "$date" ]; then
-				date=$(dmidecode -t 0x000e | grep "Release Date:" | cut -d'/' -f3)
-			fi
-			if [ ! -z "$date" ]; then
-				if [ $date -lt $year  ]; then
-					check_message "BIOS indicates machine is more then $MAX_AGE years old"
-					skip=1
-				fi
-			fi
-		fi
-		;;
-	*)
-		echo "other"
-		;;
-	esac
-
-	mem=$(free | grep Mem: | awk '{print $2}')
-	mem=$((mem / 1024))
-	if [ $mem -lt $MIN_MEM ]; then
-		check_message "Machine has only $mem MB memory, requires at least $MIN_MEM MB"
-		skip=1
-	fi
-	disk=$(df . -B 1024  | awk '{print $4}' | tail -1)
-	disk=$((disk / 1048576))
-	if [ $disk -lt $MIN_DISK ]; then
-		check_message "Machine has only $disk GB free disk space, requires at least $MIN_DISK GB"
-		skip=1
-	fi
-
-	if [ $skip -ne 0 ]; then
-		exit 0
-	fi
-
-	echo "$hostname: $processor $mem MB memory, $disk GB disk"
-}
-
 secs_now()
 {
 	date "+%s"
 }
 
-check_machine
 
 passed=""
 failed=""
diff --git a/ubuntu_stress_smoke_test/ubuntu_stress_smoke_test.py b/ubuntu_stress_smoke_test/ubuntu_stress_smoke_test.py
index 2d78cf7..6fec4d2 100644
--- a/ubuntu_stress_smoke_test/ubuntu_stress_smoke_test.py
+++ b/ubuntu_stress_smoke_test/ubuntu_stress_smoke_test.py
@@ -78,6 +78,15 @@ class ubuntu_stress_smoke_test(test.test):
     def run_once(self, test_name):
         if test_name == 'setup':
             return
+        elif test_name == 'setup-check':
+            cmd = '%s/ubuntu_stress_smoke_test_checks.sh' % (self.bindir)
+            utils.system_output(cmd, retain_output=True)
+            return
+        elif test_name == 'setup-init':
+            cmd = '%s/ubuntu_stress_smoke_test_init.sh' % (self.bindir)
+            utils.system_output(cmd, retain_output=True)
+            return
+
 
         if os.uname()[1] == '202008-28164-ZCU106':
             raise error.TestFail('Test marked as failed for ZCU106 as requested by portias, dev test hang (LP: #1998738)')
diff --git a/ubuntu_stress_smoke_test/ubuntu_stress_smoke_test_checks.sh b/ubuntu_stress_smoke_test/ubuntu_stress_smoke_test_checks.sh
new file mode 100755
index 0000000..807ebfa
--- /dev/null
+++ b/ubuntu_stress_smoke_test/ubuntu_stress_smoke_test_checks.sh
@@ -0,0 +1,89 @@
+#!/bin/bash
+
+# Maximum machine age in years
+MAX_AGE=5
+# minimum required memory in MB
+MIN_MEM=$((3 * 1024))
+# minimum free disk required in GB
+MIN_DISK=$((4))
+
+check_message()
+{
+	echo "NOTE: $1, skipping test"
+}
+
+check_machine()
+{
+	hostname=$(hostname)
+	processor=$(uname -p)
+	skip=0
+	case "$processor" in
+	i386 | i486 | i586 | i686 | x86_64)
+		datecheck=1
+
+		manufacturer=$(dmidecode -s system-manufacturer)
+		if [ "$manufacturer" == "QEMU" ]; then
+			echo "QEMU instance, no firmware date checking"
+			datecheck=0
+		fi
+
+		vendor=$(dmidecode -t 0x0000 | grep Vendor: | awk '{ print $2}')
+		if [ -z "$vendor" ]; then
+			vendor=$(dmidecode -t 0x000e | grep Vendor: | awk '{ print $2}')
+		fi
+
+		case "$vendor" in
+		unknown | Unknown)
+			check_message "Unknown BIOS vendor, ignoring machine"
+			skip=1
+			datecheck=0
+			;;
+		SeaBIOS)
+			echo "SeaBIOS BIOS, using a VM, no date checking"
+			datecheck=0
+			;;
+		*)
+			;;
+		esac
+
+		if [ $datecheck -eq 1 ]; then
+			year=$(date +%Y)
+			year=$((year - $MAX_AGE))
+			date=$(dmidecode -t 0x0000 | grep "Release Date:" | cut -d'/' -f3)
+			if [ -z "$date" ]; then
+				date=$(dmidecode -t 0x000e | grep "Release Date:" | cut -d'/' -f3)
+			fi
+			if [ ! -z "$date" ]; then
+				if [ $date -lt $year  ]; then
+					check_message "BIOS indicates machine is more then $MAX_AGE years old"
+					skip=1
+				fi
+			fi
+		fi
+		;;
+	*)
+		echo "other"
+		;;
+	esac
+
+	mem=$(free | grep Mem: | awk '{print $2}')
+	mem=$((mem / 1024))
+	if [ $mem -lt $MIN_MEM ]; then
+		check_message "Machine has only $mem MB memory, requires at least $MIN_MEM MB"
+		skip=1
+	fi
+	disk=$(df . -B 1024  | awk '{print $4}' | tail -1)
+	disk=$((disk / 1048576))
+	if [ $disk -lt $MIN_DISK ]; then
+		check_message "Machine has only $disk GB free disk space, requires at least $MIN_DISK GB"
+		skip=1
+	fi
+
+	if [ $skip -ne 0 ]; then
+		exit 1
+	fi
+
+	echo "$hostname: $processor $mem MB memory, $disk GB disk"
+}
+
+check_machine