Merge pull request os-autoinst#15818 from simonlm/remove_blacklist

Add PBOffline to test the support for sle15sp5, and remove the blackl…
mpagot · Nov 2, 2022 · 6dc6f1a · 6dc6f1a
2 parents 1425389 + 02ac9bc
commit 6dc6f1a
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/schedule/sle-perf/hana_install.yaml b/schedule/sle-perf/hana_install.yaml
@@ -35,9 +35,16 @@ conditional_schedule:
         - '{{fix_sle_15gm_multi_disks}}'
         - '{{separate_home}}'
         - '{{partitioning_method}}'
+      kvm:
+        - '{{fix_sle_15gm_multi_disks}}'
+        - '{{partitioning_method}}'
   fix_sle_15gm_multi_disks:
     VERSION:
       15:
+        - '{{fix_sle_15gm_multi_disks_by_arch}}'
+  fix_sle_15gm_multi_disks_by_arch:
+    ARCH:
+      ppc64le:
         - installation/partitioning_smalldisk_storageng
   disable_grub_graphics:
     ARCH:
@@ -80,13 +87,30 @@ conditional_schedule:
         - installation/partitioning/no_enlarge_swap
       15-SP4:
         - installation/partitioning/no_enlarge_swap
+      15-SP5:
+        - installation/partitioning/no_enlarge_swap
+  ppc64le_partitioning_smalldisk_storageng_by_version:
+    VERSION:
+      12-SP4:
+        - installation/partitioning_smalldisk_storageng
+      12-SP5:
+        - installation/partitioning_smalldisk_storageng
+      15-SP1:
+        - installation/partitioning_smalldisk_storageng
+      15-SP2:
+        - installation/partitioning_smalldisk_storageng
+      15-SP3:
+        - installation/partitioning_smalldisk_storageng
+      15-SP4:
+        - installation/partitioning_smalldisk_storageng
+      15-SP5:
+        - installation/partitioning_smalldisk_storageng
   partitioning_method:
     ARCH:
       x86_64:
         - installation/partitioning_firstdisk
       ppc64le:
-        - installation/partitioning_smalldisk_storageng
-        - '{{fix_sle_15gm_multi_disks}}'
+        - '{{ppc64le_partitioning_smalldisk_storageng_by_version}}'
   change_desktop:
     VERSION:
       12-SP4:

diff --git a/tests/kernel_performance/install_qatestset.pm b/tests/kernel_performance/install_qatestset.pm
@@ -50,6 +50,9 @@ sub setup_environment {
 
     assert_script_run("systemctl disable qaperf.service");
     if (get_var("HANA_PERF")) {
+        # Remove blacklist megaraid_sas 50-blacklist.conf to make sure all disks are present next reboot
+        script_run("sed -e '/^blacklist megaraid_sas/s/^/#/g' -i /etc/modprobe.d/50-blacklist.conf");
+
         my $qaset_kernel_tag = ' ' . get_var('QASET_KERNEL_TAG', '');
         assert_script_run("/usr/share/qa/qaset/bin/deploy_hana_perf.sh HANA $mitigation_switch $qaset_kernel_tag");
         assert_script_run("ls /root/qaset/deploy_hana_perf_env.done");