Merge pull request #418 from pablo-herranz/poo153502_wsl-yaml-schedul…

…e-fix Change tags in yaml files to fix the tests
os-autoinst · Jan 18, 2024 · 2bd8cba · 2bd8cba
2 parents ccdfcf0 + 0f4e5aa
commit 2bd8cba
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/job_groups/opensuse_leap_15.6_wsl.yaml b/job_groups/opensuse_leap_15.6_wsl.yaml
@@ -36,10 +36,10 @@ scenarios:
             YAML_SCHEDULE: 'schedule/wsl/wsl_main.yaml'
             WSL_INSTALL_FROM: 'build'
             QEMU_ENABLE_SMBD: '1'
-      - wsl2-main: &wsl2_defaults
+      - wsl2-main: &wsl2_test
           testsuite: null
           machine: [win10_64bit, win10_uefi, win11_uefi]
-          settings:
+          settings: &wsl2_settings
             YAML_SCHEDULE: 'schedule/wsl/wsl_main.yaml'
             WSL_INSTALL_FROM: 'build'
             QEMU_ENABLE_SMBD: '1'
@@ -49,17 +49,18 @@ scenarios:
             WORKER_CLASS: 'wsl2'
       # to be re-enabled after GA, when 15.6 is available in the Store.
       # - wsl2-install-msstore:
-      #     <<: *wsl2_defaults
+      #     <<: *wsl2_test
       #     description: |
       #       Basic WSL test Test scope:
       #           1) Prepare WSL and other features in Windows
       #           2) Install WSL image from the MS Store via CLI
       #     settings:
+      #       <<: *wsl2_settings
       #       WSL_VERSION: 'openSUSE Leap 15.6'
       #       WSL_INSTALL_FROM: 'msstore'
       - wsl2-systemd:
-          <<: *wsl2_defaults
+          <<: *wsl2_test
           description: 'Enable and test systemd in WSL'
           settings:
-            YAML_SCHEDULE: 'schedule/wsl/wsl_main.yaml'
+            <<: *wsl2_settings
             WSL_SYSTEMD: '1'
diff --git a/job_groups/opensuse_tumbleweed.yaml b/job_groups/opensuse_tumbleweed.yaml
@@ -1120,10 +1120,10 @@ scenarios:
             YAML_SCHEDULE: 'schedule/wsl/wsl_main.yaml'
             WSL_INSTALL_FROM: 'build'
             QEMU_ENABLE_SMBD: '1'
-      - wsl2-main: &wsl2_defaults
+      - wsl2-main: &wsl2_test
           testsuite: null
           machine: [win10_64bit, win10_uefi, win11_uefi]
-          settings:
+          settings: &wsl2_settings
             YAML_SCHEDULE: 'schedule/wsl/wsl_main.yaml'
             WSL_INSTALL_FROM: 'build'
             QEMU_ENABLE_SMBD: '1'
@@ -1132,18 +1132,18 @@ scenarios:
             QEMUMACHINE: 'q35,accel=whpx'
             WORKER_CLASS: 'wsl2'
       - wsl2-install-msstore:
-          <<: *wsl2_defaults
+          <<: *wsl2_test
           description: |
             Basic WSL test Test scope:
                 1) Prepare WSL and other features in Windows
                 2) Install WSL image from the MS Store via CLI
           settings:
-            YAML_SCHEDULE: 'schedule/wsl/wsl_main.yaml'
+            <<: *wsl2_settings
             WSL_VERSION: 'openSUSE Tumbleweed'
             WSL_INSTALL_FROM: 'msstore'
       - wsl2-systemd:
-          <<: *wsl2_defaults
+          <<: *wsl2_test
           description: 'Enable and test systemd in WSL'
           settings:
-            YAML_SCHEDULE: 'schedule/wsl/wsl_main.yaml'
+            <<: *wsl2_settings
             WSL_SYSTEMD: '1'