Merge ~canonical-kernel-team/+git/autotest-client-tests:phlin/stress-smoke-flexible-check into ~canonical-kernel-team/+git/autotest-client-tests:master

[Po-Hsu Lin]

KERNTT-777

The BIOS age was hard-coded to 5 years in commit 0e0870372f "UBUNTU
SAUCE: ubuntu stress smoke test: add minimum machine spec to run test"
back in 2020.

Change this to check BIOS with release year >= 2015 instead, so we
don't need to bump this regularly.

Also skip date check on Xen instances, they known to work but the BIOS
date will report 2006 on these instances.

[Francis Ginther (fginther)]

+1

review: Approve

diff --git a/ubuntu_stress_smoke_test/ubuntu_stress_smoke_test_checks.sh b/ubuntu_stress_smoke_test/ubuntu_stress_smoke_test_checks.sh
index 807ebfa..6085f39 100755
--- a/ubuntu_stress_smoke_test/ubuntu_stress_smoke_test_checks.sh
+++ b/ubuntu_stress_smoke_test/ubuntu_stress_smoke_test_checks.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-# Maximum machine age in years
-MAX_AGE=5
+# Maximum machine age was set to 5 years by Colin in 2020, let's use 2015 as the bar
+MIN_YEAR=2015
 # minimum required memory in MB
 MIN_MEM=$((3 * 1024))
 # minimum free disk required in GB
@@ -22,8 +22,8 @@ check_machine()
 		datecheck=1
 
 		manufacturer=$(dmidecode -s system-manufacturer)
-		if [ "$manufacturer" == "QEMU" ]; then
-			echo "QEMU instance, no firmware date checking"
+		if [ "$manufacturer" == "QEMU" ] || [ "$manufacturer" == "Xen" ]; then
+			echo "$manufacturer instance, no firmware date checking"
 			datecheck=0
 		fi
 
@@ -47,15 +47,13 @@ check_machine()
 		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"
+				if [ $date -lt $MIN_YEAR ]; then
+					check_message "BIOS indicates machine was released in $date, older then $MIN_YEAR."
 					skip=1
 				fi
 			fi