Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change tags in yaml files to fix the tests #418

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions job_groups/opensuse_leap_15.6_wsl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
12 changes: 6 additions & 6 deletions job_groups/opensuse_tumbleweed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'