From 788ee6ae7f6030e0ea473b450a67c52a0a4a0941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Herranz=20Ram=C3=ADrez?= Date: Tue, 12 Dec 2023 09:47:30 +0100 Subject: [PATCH] New test for checking systemd in WSL WSL now supports systemd, so there's need to check that we can enable and test it --- job_groups/opensuse_leap_15.6_wsl.yaml | 15 +++++++-------- job_groups/opensuse_tumbleweed.yaml | 15 +++++++-------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/job_groups/opensuse_leap_15.6_wsl.yaml b/job_groups/opensuse_leap_15.6_wsl.yaml index dc08082a..503a3df0 100644 --- 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,17 @@ 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 # 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 index 5355f2d0..a7406104 100644 --- a/job_groups/opensuse_tumbleweed.yaml +++ b/job_groups/opensuse_tumbleweed.yaml @@ -1143,7 +1143,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: @@ -1155,18 +1155,17 @@ 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 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'