From 323ee69e8e11d69642e7a18da990d83b05cd3273 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Fri, 28 Aug 2020 15:43:13 -0500 Subject: configd: T2582: add build dependency --- docker/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index c892b64b..d5f1543a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -361,6 +361,10 @@ RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \ libaudit-dev +# Packages needed for vyos-configd +RUN apt-get update && apt-get install -y \ + libzmq3-dev + # Install packer RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \ export LATEST="$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packer | \ -- cgit v1.2.3 From c3c1fa4518f7889f8d65188b6069f4b07071133a Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Fri, 28 Aug 2020 15:43:25 -0500 Subject: configd: T2582: enable vyos-configd.service --- data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 + 1 file changed, 1 insertion(+) 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 0ac9215f..92312276 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 @@ -52,3 +52,4 @@ echo I: Enabling services systemctl enable ssh-session-cleanup.service systemctl enable vyos-hostsd.service systemctl enable acpid.service +systemctl enable vyos-configd.service -- cgit v1.2.3 From 2fd5898643d075857ef0bdb4e24db3c7fdd79863 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Fri, 28 Aug 2020 15:43:31 -0500 Subject: configd: T2582: add option to run testsuite with daemon (default off) --- Makefile | 9 +++++++++ scripts/check-qemu-install | 13 +++++++++++++ 2 files changed, 22 insertions(+) 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() @@ -276,6 +279,16 @@ try: # additional settling time 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 ################################################# -- cgit v1.2.3