Merge pull request #400 from pablo-herranz/poo133691_new-test-wsl+sys…

…temd New test for checking systemd in WSL
os-autoinst · Jan 11, 2024 · 3015264 · 3015264
2 parents 231571b + 1925d60
commit 3015264
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 20 deletions.
diff --git a/job_groups/opensuse_leap_15.6_wsl.yaml b/job_groups/opensuse_leap_15.6_wsl.yaml
@@ -36,7 +36,7 @@ scenarios:
             YAML_SCHEDULE: 'schedule/wsl/wsl_main.yaml'
             WSL_INSTALL_FROM: 'build'
             QEMU_ENABLE_SMBD: '1'
-      - wsl2-main:
+      - wsl2-main: &wsl2_defaults
           testsuite: null
           machine: [win10_64bit, win10_uefi, win11_uefi]
           settings:
@@ -49,18 +49,16 @@ scenarios:
             WORKER_CLASS: 'wsl2'
       # to be re-enabled after GA, when 15.6 is available in the Store.
       # - wsl2-install-msstore:
-      #     testsuite: null
-      #     machine: [win10_64bit, win10_uefi, win11_uefi]
+      #     <<: *wsl2_defaults
       #     description: |
       #       Basic WSL test Test scope:
       #           1) Prepare WSL and other features in Windows
-      #           2) Download the winget utility and install it
-      #           3) Install WSL image from the MS Store via CLI
+      #           2) Install WSL image from the MS Store via CLI
       #     settings:
-      #       YAML_SCHEDULE: 'schedule/wsl/wsl_main.yaml'
-      #       WSL2: '1'
-      #       QEMUCPU: 'host,kvm=off,vmx=on,hypervisor=off,hv_time,hv_relaxed,hv_vapic,hv_spinlocks=0x1fff,hv_frequencies,hv_reenlightenment,hv_vpindex,hv-synic,hv-stimer,hv-stimer-direct'
-      #       QEMUMACHINE: 'q35,accel=whpx'
-      #       WORKER_CLASS: 'wsl2'
       #       WSL_VERSION: 'openSUSE Leap 15.6'
       #       WSL_INSTALL_FROM: 'msstore'
+      - wsl2-systemd:
+          <<: *wsl2_defaults
+          description: 'Enable and test systemd in WSL'
+          settings:
+            WSL_SYSTEMD: '1'
diff --git a/job_groups/opensuse_tumbleweed.yaml b/job_groups/opensuse_tumbleweed.yaml
@@ -1106,7 +1106,7 @@ scenarios:
             YAML_SCHEDULE: 'schedule/wsl/wsl_main.yaml'
             WSL_INSTALL_FROM: 'build'
             QEMU_ENABLE_SMBD: '1'
-      - wsl2-main:
+      - wsl2-main: &wsl2_defaults
           testsuite: null
           machine: [win10_64bit, win10_uefi, win11_uefi]
           settings:
@@ -1118,18 +1118,16 @@ scenarios:
             QEMUMACHINE: 'q35,accel=whpx'
             WORKER_CLASS: 'wsl2'
       - wsl2-install-msstore:
-          testsuite: null
-          machine: [win10_64bit, win10_uefi, win11_uefi]
+          <<: *wsl2_defaults
           description: |
             Basic WSL test Test scope:
                 1) Prepare WSL and other features in Windows
-                2) Download the winget utility and install it
-                3) Install WSL image from the MS Store via CLI
+                2) Install WSL image from the MS Store via CLI
           settings:
-            YAML_SCHEDULE: 'schedule/wsl/wsl_main.yaml'
-            WSL2: '1'
-            QEMUCPU: 'host,kvm=off,vmx=on,hypervisor=off,hv_time,hv_relaxed,hv_vapic,hv_spinlocks=0x1fff,hv_frequencies,hv_reenlightenment,hv_vpindex,hv-synic,hv-stimer,hv-stimer-direct'
-            QEMUMACHINE: 'q35,accel=whpx'
-            WORKER_CLASS: 'wsl2'
             WSL_VERSION: 'openSUSE Tumbleweed'
             WSL_INSTALL_FROM: 'msstore'
+      - wsl2-systemd:
+          <<: *wsl2_defaults
+          description: 'Enable and test systemd in WSL'
+          settings:
+            WSL_SYSTEMD: '1'