diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-12 21:28:56 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-12 21:28:56 +0200 |
commit | f634fd39001ad3dc62b83e5d78c6912db915a1e9 (patch) | |
tree | b7f5ad11be24f0d63cc8dd76a978781014a5e788 /contrib/cirrus/check_image.sh | |
parent | 3cf4567e1dfcf172673694a1171ae18bcbf9c846 (diff) | |
parent | b843804d51ec3fb747670201b6178896d9a4580d (diff) | |
download | podman-f634fd39001ad3dc62b83e5d78c6912db915a1e9.tar.gz podman-f634fd39001ad3dc62b83e5d78c6912db915a1e9.tar.bz2 podman-f634fd39001ad3dc62b83e5d78c6912db915a1e9.zip |
Merge pull request #3607 from cevich/cgroup2_vm
Add another Fedora VM with cgroups v2 enabled
Diffstat (limited to 'contrib/cirrus/check_image.sh')
-rwxr-xr-x | contrib/cirrus/check_image.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/contrib/cirrus/check_image.sh b/contrib/cirrus/check_image.sh index 8a9fbae1d..c8e8c4c63 100755 --- a/contrib/cirrus/check_image.sh +++ b/contrib/cirrus/check_image.sh @@ -4,6 +4,8 @@ set -eo pipefail source $(dirname $0)/lib.sh +req_env_var PACKER_BUILDER_NAME TEST_REMOTE_CLIENT EVIL_UNITS OS_RELEASE_ID + NFAILS=0 echo "Validating VM image" @@ -49,5 +51,16 @@ then item_test "On ubuntu /usr/bin/runc is /usr/lib/cri-o-runc/sbin/runc" "$SAMESAME" -eq "0" || let "NFAILS+=1" fi +echo "Checking items specific to ${PACKER_BUILDER_NAME}${BUILT_IMAGE_SUFFIX}" +case "$PACKER_BUILDER_NAME" in + xfedora*) + echo "Kernel Command-line: $(cat /proc/cmdline)" + item_test \ + "On ${PACKER_BUILDER_NAME} images, the /sys/fs/cgroup/unified directory does NOT exist" \ + "!" "-d" "/sys/fs/cgroup/unified" || let "NFAILS+=1" + ;; + *) echo "No vm-image specific items to check" +esac + echo "Total failed tests: $NFAILS" exit $NFAILS |