Merge pull request #963 from jestabro/config-context

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

Author: jestabro

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

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',