Skip to content

smoketest: T8087: reorganize folderstructure for embedded configttests #1076

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.

Sign up for GitHub

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

Merged
c-po merged 1 commit into from
Dec 11, 2025
Merged

smoketest: T8087: reorganize folderstructure for embedded configttests #1076

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions scripts/check-qemu-install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -913,18 +913,19 @@ try:

elif args.smoketest:
# run default smoketest suite
smoketests_path = '/usr/libexec/vyos/tests/smoke'
if args.match:
# Remove tests that we don't want to run
match_str = '-o '.join([f'-name "test_*{name}*.py" ' for name in args.match.split("|")]).strip()
c.sendline(f'sudo find /usr/libexec/vyos/tests/smoke -maxdepth 2 -type f -name test_* ! \( {match_str} \) -delete')
c.sendline(f'sudo find {smoketests_path} -maxdepth 2 -type f -name test_* ! \( {match_str} \) -delete')
c.expect(op_mode_prompt)
if args.no_interfaces:
# remove interface tests as they consume a lot of time
c.sendline('sudo rm -f /usr/libexec/vyos/tests/smoke/cli/test_interfaces_*')
c.sendline('sudo rm -f {smoketests_path}/cli/test_interfaces_*')
c.expect(op_mode_prompt)
if args.no_vpp:
# remove VPP tests
c.sendline('sudo rm -f /usr/libexec/vyos/tests/smoke/cli/test_vpp*')
c.sendline('sudo rm -f {smoketests_path}/cli/test_vpp*')
c.expect(op_mode_prompt)

if args.vyconf:
Expand Down Expand Up @@ -959,24 +960,26 @@ try:
elif args.configtest:
# Remove config-tests that we don't want to run
if args.match:
configs_path = '/usr/libexec/vyos/tests/configs'
if args.match.startswith("!"):
# Exclude mode — delete only the matched names
names = args.match[1:].split("|")
match_str = '-o '.join([f'-name "{name}"' for name in names])
cleanup_config_dir_cmd = f'sudo find /usr/libexec/vyos/tests/config -mindepth 1 -maxdepth 1 \\( {match_str} \\) -exec rm -rf {{}} +'
cleanup_config_tests_dir_cmd = f'sudo find /usr/libexec/vyos/tests/config-tests -mindepth 1 -maxdepth 1 \\( {match_str} \\) -exec rm -rf {{}} +'
cleanup_config_dir_cmd = f'sudo find {configs_path} -mindepth 1 -maxdepth 1 -type f \\( {match_str} \\) -exec rm -rf {{}} +'
cleanup_config_tests_dir_cmd = f'sudo find {configs_path}/assert -mindepth 1 -maxdepth 1 -type f \\( {match_str} \\) -exec rm -rf {{}} +'
else:
# Include mode — keep only the matched names, delete the rest
names = args.match.split("|")
match_str = '-o '.join([f'-name "{name}"' for name in names])
cleanup_config_dir_cmd = f'sudo find /usr/libexec/vyos/tests/config -mindepth 1 -maxdepth 1 ! \\( {match_str} \\) -exec rm -rf {{}} +'
cleanup_config_tests_dir_cmd = f'sudo find /usr/libexec/vyos/tests/config-tests -mindepth 1 -maxdepth 1 ! \\( {match_str} \\) -exec rm -rf {{}} +'
cleanup_config_dir_cmd = f'sudo find {configs_path} -mindepth 1 -maxdepth 1 -type f ! \\( {match_str} \\) -exec rm -rf {{}} +'
cleanup_config_tests_dir_cmd = f'sudo find {configs_path}/assert -mindepth 1 -maxdepth 1 -type f ! \\( {match_str} \\) -exec rm -rf {{}} +'

c.sendline(cleanup_config_dir_cmd)
c.expect(op_mode_prompt)
c.sendline(cleanup_config_tests_dir_cmd)
c.expect(op_mode_prompt)


log.info('Adding a legacy WireGuard default keypair for migrations')
c.sendline('sudo mkdir -p /config/auth/wireguard/default')
c.expect(op_mode_prompt)
Expand Down
Loading