diff options
| author | John Estabrook <jestabro@vyos.io> | 2025-05-22 13:37:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-22 13:37:19 -0500 |
| commit | bc77b388e7fe99f065b19df7244ade4e421f096e (patch) | |
| tree | ad667c69ddf6a38d5a2efd927decc350586f1358 | |
| parent | 9f1bf2d61cd31cbaf4902b0db20b8d47e224deb3 (diff) | |
| parent | 45c21a06ea85da77830ce1c1b10b0d1e133350ba (diff) | |
| download | vyos-build-bc77b388e7fe99f065b19df7244ade4e421f096e.tar.gz vyos-build-bc77b388e7fe99f065b19df7244ade4e421f096e.zip | |
Merge pull request #963 from jestabro/config-context
T7352: add arg to test script for running smoketests under vyconfd/commitd
| -rwxr-xr-x | data/live-build-config/hooks/live/18-enable-disable_services.chroot | 3 | ||||
| -rwxr-xr-x | scripts/check-qemu-install | 7 |
2 files changed, 8 insertions, 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 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', |