From c1adab0c1392c523932c4e7aa6bfa20f91cc6af6 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Mon, 7 Apr 2025 15:54:33 -0500 Subject: [PATCH 1/2] T7321: enable vyos-commitd.service for intial testing --- .../hooks/live/18-enable-disable_services.chroot | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot index 1a464404..04ca7f3e 100755 --- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot +++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot @@ -71,16 +71,15 @@ systemctl disable zabbix-agent2.service systemctl disable suricata.service systemctl disable vyconfd.service systemctl disable vpp.service -systemctl disable vyos-commitd.service systemctl disable netplug.service - echo I: Enabling services systemctl enable vyos-hostsd.service systemctl enable acpid.service systemctl enable vyos-router.service systemctl enable vyos-configd.service systemctl enable vyos-grub-update.service +systemctl enable vyos-commitd.service echo I: Masking services systemctl mask systemd-journald-audit.socket From 45c21a06ea85da77830ce1c1b10b0d1e133350ba Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Wed, 7 May 2025 21:18:42 -0500 Subject: [PATCH 2/2] T7352: add test script arg for testing under vyconfd/commitd --- scripts/check-qemu-install | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index ab6e1b1f..61f3d28f 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -97,6 +97,8 @@ parser.add_argument('--qemu-cmd', help='Only generate QEMU launch command', action='store_true', default=False) 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) args = parser.parse_args() @@ -805,6 +807,11 @@ try: c.sendline('sudo rm -f /usr/libexec/vyos/tests/smoke/cli/test_interfaces_*') c.expect(op_mode_prompt) + if args.vyconf: + c.sendline('sudo /usr/libexec/vyos/set_vyconf_backend.py --no-prompt &> /dev/null') + c.expect(op_mode_prompt) + log.info('Smoketests will be run using vyconfd/vyos-commitd') + log.info('Executing VyOS smoketests') c.sendline('/usr/bin/vyos-smoketest') i = c.expect(['\n +Invalid command:', '\n +Set failed',