From a363ed8b6e6889a16c9ccf913ac99d2b546d0d9b Mon Sep 17 00:00:00 2001 From: "James O. D. Hunt" Date: Thu, 22 Mar 2018 16:01:30 +0000 Subject: [PATCH 1/3] scripts: Make collect script consider other runtimes Look for other runtime packages (Clear Containers and `runv`-based) in data collection script. Signed-off-by: James O. D. Hunt --- data/kata-collect-data.sh.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/data/kata-collect-data.sh.in b/data/kata-collect-data.sh.in index b26044c83..59f34471c 100644 --- a/data/kata-collect-data.sh.in +++ b/data/kata-collect-data.sh.in @@ -261,8 +261,11 @@ show_package_versions() local pattern="(" local project - # CC 2.x runtime. This shouldn't be installed but let's check anyway + # CC 2.x, 3.0 and runv runtimes. They shouldn't be installed but let's + # check anyway. pattern+="cc-oci-runtime" + pattern+="cc-runtime" + pattern+="runv" # core components for project in @PROJECT_TYPE@ From a20b8d21757d77c4cc1556f8d3ae95a53389c193 Mon Sep 17 00:00:00 2001 From: "James O. D. Hunt" Date: Thu, 22 Mar 2018 16:02:44 +0000 Subject: [PATCH 2/3] scripts: Collect script should consider Kata images only Fix bug where collect script was looking for Clear Containers images rather than Kata Containers ones. Signed-off-by: James O. D. Hunt --- data/kata-collect-data.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/kata-collect-data.sh.in b/data/kata-collect-data.sh.in index 59f34471c..dc2d05e96 100644 --- a/data/kata-collect-data.sh.in +++ b/data/kata-collect-data.sh.in @@ -273,10 +273,10 @@ show_package_versions() pattern+="|${project}-proxy" pattern+="|${project}-runtime" pattern+="|${project}-shim" + pattern+="|${project}-containers-image" done # assets - pattern+="|clear-containers-image" pattern+="|linux-container" # optimised hypervisor From a938045d1c4d13f0e4aa8beea78b8db593579d15 Mon Sep 17 00:00:00 2001 From: "James O. D. Hunt" Date: Thu, 22 Mar 2018 16:03:44 +0000 Subject: [PATCH 3/3] scripts: Make collect script hypervisor architecture agnostic Don't hard-code the architecture when looking for hypervisor packages. Fixes #101. Signed-off-by: James O. D. Hunt --- data/kata-collect-data.sh.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/data/kata-collect-data.sh.in b/data/kata-collect-data.sh.in index dc2d05e96..2c02461f4 100644 --- a/data/kata-collect-data.sh.in +++ b/data/kata-collect-data.sh.in @@ -279,11 +279,8 @@ show_package_versions() # assets pattern+="|linux-container" - # optimised hypervisor - pattern+="|qemu-lite" - - # default distro hypervisor - pattern+="|qemu-system-x86" + # hypervisor name prefix + pattern+="|qemu-" pattern+=")"