From bfd7a62f1f843a628fb19c41c155760576c78f94 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 10 May 2017 13:27:57 +0100 Subject: [PATCH 1/2] tests: Update virtsock stress test commit The new version has improvements to the Windows code as well as initial support for the VMware/virtio based Hyper-V socket interface. Signed-off-by: Rolf Neugebauer --- test/pkg/virtsock/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/pkg/virtsock/Dockerfile b/test/pkg/virtsock/Dockerfile index c38b721c0..7e62b6567 100644 --- a/test/pkg/virtsock/Dockerfile +++ b/test/pkg/virtsock/Dockerfile @@ -1,6 +1,6 @@ FROM linuxkit/go-compile:4513068d9a7e919e4ec42e2d7ee879ff5b95b7f5@sha256:bdfadbe3e4ec699ca45b67453662321ec270f2d1a1dbdbf09625776d3ebd68c5 AS virtsock-build -ENV VIRTSOCK_COMMIT=6b4dec728264e07c41e108caebd6bc2b72559a5f +ENV VIRTSOCK_COMMIT=3bfdf22e3b63a7d130ae5db41c2d76eaffa444d4 RUN mkdir -p $GOPATH/src/github.com/rneugeba && \ cd $GOPATH/src/github.com/rneugeba && \ git clone https://github.com/rneugeba/virtsock.git From 287653c76d67bc26d9f514128e23da81eb34f951 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 10 May 2017 13:29:46 +0100 Subject: [PATCH 2/2] tests: Update virtsock YAML file Pick up the new versin of the virtsock test package Also remove the iso-ios output and adjust the choice of Linux kernels. Signed-off-by: Rolf Neugebauer --- test/cases/test-virtsock-server.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/test/cases/test-virtsock-server.yml b/test/cases/test-virtsock-server.yml index 50cd33d6a..d1776a283 100644 --- a/test/cases/test-virtsock-server.yml +++ b/test/cases/test-virtsock-server.yml @@ -1,9 +1,9 @@ kernel: # Alternatively: - # image: "linuxkit/kernel:4.10.4-0" - # image: "linuxkit/kernel:4.9.16-1" - # image: "linuxkit/kernel:4.9.14-0" + #image: "linuxkit/kernel:4.11.x" + # image: "linuxkit/kernel:4.10.x" image: "linuxkit/kernel:4.9.x" + # image: "linuxkit/kernel:4.4.x" cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b @@ -38,7 +38,7 @@ services: net: host oomScoreAdj: -800 - name: virtsock-server - image: "linuxkit/test-virtsock:bac78d3bffa55b9ab00eb023c32512e260d7fed0" + image: "linuxkit/test-virtsock:a7dc8e477d99ea82f56eacd94579ca65985eb0b3" readonly: true trust: image: @@ -46,5 +46,4 @@ trust: - linuxkit/rngd outputs: - format: kernel+initrd - - format: iso-bios - format: iso-efi