Null scheduler is not enabled on non-debug Xen builds so the current
test can lead to a failure on such jobs. We still want to test that we
can assign the cpupool to a domU with a different scheduler than default
one (credit2). Switch to credit as it is enabled by default.
Fixes: 36e3f4158778 ("automation: Add a new job for testing boot time cpupools
on arm64")
Signed-off-by: Michal Orzel <michal.or...@amd.com>
---
This patch acts as a prerequisite before merging the following patch:
https://lore.kernel.org/xen-devel/20221021132238.16056-1-michal.or...@amd.com/
(to which Henry already gave RAB), that helped to find the issue described
in the comment.
---
automation/scripts/qemu-smoke-arm64.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/automation/scripts/qemu-smoke-arm64.sh
b/automation/scripts/qemu-smoke-arm64.sh
index 5b566072f72a..a5d8d135b659 100755
--- a/automation/scripts/qemu-smoke-arm64.sh
+++ b/automation/scripts/qemu-smoke-arm64.sh
@@ -29,10 +29,10 @@ fi
fi
if [[ "${test_variant}" == "boot-cpupools" ]]; then
- # Check if domU0 (id=1) is assigned to Pool-1 with null scheduler
+ # Check if domU0 (id=1) is assigned to Pool-1 with credit scheduler
passed="${test_variant} test passed"
dom0_check="
-if xl list -c 1 | grep -q Pool-1 && xl cpupool-list Pool-1 | grep -q Pool-1;
then
+if xl list -c 1 | grep -q Pool-1 && xl cpupool-list Pool-1 | grep -q credit;
then
echo ${passed}
fi
"
@@ -140,7 +140,7 @@ fi
if [[ "${test_variant}" == "boot-cpupools" ]]; then
echo '
-CPUPOOL[0]="cpu@1 null"
+CPUPOOL[0]="cpu@1 credit"
DOMU_CPUPOOL[0]=0
NUM_CPUPOOLS=1' >> binaries/config
fi
--
2.25.1
