summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile9
-rwxr-xr-xscripts/check-qemu-install13
2 files changed, 22 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 60376e09..92cd08ec 100644
--- a/Makefile
+++ b/Makefile
@@ -230,6 +230,15 @@ test:
fi
scripts/check-qemu-install --debug build/live-image-amd64.hybrid.iso
+.PHONY: testd
+.ONESHELL:
+testd:
+ if [ ! -f build/live-image-amd64.hybrid.iso ]; then
+ echo "Could not find build/live-image-amd64.hybrid.iso"
+ exit 1
+ fi
+ scripts/check-qemu-install --debug --configd build/live-image-amd64.hybrid.iso
+
.PHONY: clean
.ONESHELL:
clean:
diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install
index b79ed03f..3d182dbe 100755
--- a/scripts/check-qemu-install
+++ b/scripts/check-qemu-install
@@ -67,6 +67,9 @@ parser.add_argument('--logfile', help='Log to file')
parser.add_argument('--no-kvm', help='Disable use of kvm',
action='store_true',
default=False)
+parser.add_argument('--configd', help='Execute testsuite with config daemon',
+ action='store_true',
+ default=False)
args = parser.parse_args()
@@ -277,6 +280,16 @@ try:
time.sleep(20)
#################################################
+ # Start/stop config daemon
+ #################################################
+ if args.configd:
+ c.sendline('sudo systemctl start vyos-configd.service &> /dev/null')
+ c.expect(r'vyos@vyos:~\$')
+ else:
+ c.sendline('sudo systemctl stop vyos-configd.service &> /dev/null')
+ c.expect(r'vyos@vyos:~\$')
+
+ #################################################
# Basic Configmode/Opmode switch
#################################################
log.info("Basic CLI configuration mode test")