Merge pull request #102 from jodh-intel/update-data-collection-script

Update data collection script based on review feedback
This commit is contained in:
Peng Tao 2018-03-23 17:41:56 +08:00 committed by GitHub
commit 003313c0f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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@
@ -270,17 +273,14 @@ 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
pattern+="|qemu-lite"
# default distro hypervisor
pattern+="|qemu-system-x86"
# hypervisor name prefix
pattern+="|qemu-"
pattern+=")"