Skip to content

T7352: add arg to test script for running smoketests under vyconfd/commitd #963

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
merged 2 commits into from
May 22, 2025
Merged

T7352: add arg to test script for running smoketests under vyconfd/commitd #963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1adab0
T7321: enable vyos-commitd.service for intial testing
jestabro Apr 7, 2025
45c21a0
T7352: add test script arg for testing under vyconfd/commitd
jestabro May 8, 2025
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
3 changes: 1 addition & 2 deletions data/live-build-config/hooks/live/18-enable-disable_services.chroot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions scripts/check-qemu-install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down Expand Up @@ -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',
Expand Down
Loading