From 1aceb0371c9d17792066648089ee753008cf2de0 Mon Sep 17 00:00:00 2001 From: Viacheslav Date: Wed, 2 Jul 2025 09:12:43 +0000 Subject: T7606: Split VPP test for smoketest Exclude VPP tests from the general tests Add the PHONY no-interfaces-no-vpp Add the PHONE testcvpp (load VPP config only) --- scripts/check-qemu-install | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'scripts/check-qemu-install') diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index 3d4a7182..e673e3e3 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -99,6 +99,8 @@ parser.add_argument('--cpu', help='Set QEMU CPU', type=int, default=2) parser.add_argument('--memory', help='Set QEMU memory', type=int, default=4) parser.add_argument('--vyconf', help='Execute testsuite with vyconfd', action='store_true', default=False) +parser.add_argument('--no-vpp', help='Execute testsuite without VPP tests', + action='store_true', default=False) args = parser.parse_args() @@ -806,6 +808,10 @@ try: # remove interface tests as they consume a lot of time c.sendline('sudo rm -f /usr/libexec/vyos/tests/smoke/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.expect(op_mode_prompt) if args.vyconf: c.sendline('sudo /usr/libexec/vyos/set_vyconf_backend.py --no-prompt &> /dev/null') @@ -837,6 +843,14 @@ try: # else, run configtest suite elif args.configtest: + if args.match: + # Remove config-tests that we don't want to run + match_str = '-o '.join([f'-name "{name}"' for name in args.match.split("|")]) + c.sendline(f'sudo find /usr/libexec/vyos/tests/config -mindepth 1 -maxdepth 1 ! \( {match_str} \) -exec rm -rf {{}} +') + c.expect(op_mode_prompt) + c.sendline(f'sudo find /usr/libexec/vyos/tests/config-tests -mindepth 1 -maxdepth 1 ! \( {match_str} \) -exec rm -rf {{}} +') + 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) -- cgit v1.2.3