vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

test: add CGROUP_MANAGER env to switch to systemd

Browse source 
default is still cgroupfs

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2017-05-18 17:39:44 +02:00
parent 645622300a
commit 4dcf33581c
No known key found for this signature in database
GPG key ID: B2BEAD150DE936B9
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/helpers.bash
View file

@ -47,6 +47,8 @@ ARTIFACTS_PATH=${ARTIFACTS_PATH:-${CRIO_ROOT}/cri-o/.artifacts}
CHECKSECCOMP_BINARY=${CHECKSECCOMP_BINARY:-${CRIO_ROOT}/cri-o/test/checkseccomp/checkseccomp} CHECKSECCOMP_BINARY=${CHECKSECCOMP_BINARY:-${CRIO_ROOT}/cri-o/test/checkseccomp/checkseccomp}
# XXX: This is hardcoded inside cri-o at the moment. # XXX: This is hardcoded inside cri-o at the moment.
DEFAULT_LOG_PATH=/var/log/crio/pods DEFAULT_LOG_PATH=/var/log/crio/pods
# Cgroup manager to be used
CGROUP_MANAGER=${CGROUP_MANAGER:-cgroupfs}
TESTDIR=$(mktemp -d) TESTDIR=$(mktemp -d)
if [ -e /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then if [ -e /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
@ -146,7 +148,7 @@ function start_crio() {
"$BIN2IMG_BINARY" --root "$TESTDIR/crio" $STORAGE_OPTS --runroot "$TESTDIR/crio-run" --source-binary "$PAUSE_BINARY" "$BIN2IMG_BINARY" --root "$TESTDIR/crio" $STORAGE_OPTS --runroot "$TESTDIR/crio-run" --source-binary "$PAUSE_BINARY"
fi fi
"$COPYIMG_BINARY" --root "$TESTDIR/crio" $STORAGE_OPTS --runroot "$TESTDIR/crio-run" --image-name=redis:alpine --import-from=dir:"$ARTIFACTS_PATH"/redis-image --add-name=docker://docker.io/library/redis:alpine --signature-policy="$INTEGRATION_ROOT"/policy.json "$COPYIMG_BINARY" --root "$TESTDIR/crio" $STORAGE_OPTS --runroot "$TESTDIR/crio-run" --image-name=redis:alpine --import-from=dir:"$ARTIFACTS_PATH"/redis-image --add-name=docker://docker.io/library/redis:alpine --signature-policy="$INTEGRATION_ROOT"/policy.json
"$CRIO_BINARY" --conmon "$CONMON_BINARY" --listen "$CRIO_SOCKET" --runtime "$RUNTIME_BINARY" --root "$TESTDIR/crio" --runroot "$TESTDIR/crio-run" $STORAGE_OPTS --seccomp-profile "$seccomp" --apparmor-profile "$apparmor" --cni-config-dir "$CRIO_CNI_CONFIG" --signature-policy "$INTEGRATION_ROOT"/policy.json --config /dev/null config >$CRIO_CONFIG "$CRIO_BINARY" --conmon "$CONMON_BINARY" --listen "$CRIO_SOCKET" --cgroup-manager "$CGROUP_MANAGER" --runtime "$RUNTIME_BINARY" --root "$TESTDIR/crio" --runroot "$TESTDIR/crio-run" $STORAGE_OPTS --seccomp-profile "$seccomp" --apparmor-profile "$apparmor" --cni-config-dir "$CRIO_CNI_CONFIG" --signature-policy "$INTEGRATION_ROOT"/policy.json --config /dev/null config >$CRIO_CONFIG
# Prepare the CNI configuration files, we're running with non host networking by default # Prepare the CNI configuration files, we're running with non host networking by default
if [[ -n "$4" ]]; then if [[ -n "$4" ]]; then

2
test/testdata/sandbox_config.json vendored
View file

@ -52,7 +52,7 @@
"security.alpha.kubernetes.io/seccomp/pod": "unconfined" "security.alpha.kubernetes.io/seccomp/pod": "unconfined"
}, },
"linux": { "linux": {
"cgroup_parent": "/crio-podsandbox1", "cgroup_parent": "/Burstable/pod_123-456",
"security_context": { "security_context": {
"namespace_options": { "namespace_options": {
"host_network": false, "host_network": false,

2
test/testdata/sandbox_config_hostnet.json vendored
View file

@ -51,7 +51,7 @@
"security.alpha.kubernetes.io/seccomp/pod": "unconfined" "security.alpha.kubernetes.io/seccomp/pod": "unconfined"
}, },
"linux": { "linux": {
"cgroup_parent": "/crio-podsandbox1", "cgroup_parent": "/Burstable/pod_123-456",
"security_context": { "security_context": {
"namespace_options": { "namespace_options": {
"host_network": true, "host_network": true,

2
test/testdata/sandbox_config_seccomp.json vendored
View file

@ -50,7 +50,7 @@
%VALUE% %VALUE%
}, },
"linux": { "linux": {
"cgroup_parent": "podsandbox1.slice:container:infra", "cgroup_parent": "/Burstable/pod_123-456",
"security_context": { "security_context": {
"namespace_options": { "namespace_options": {
"host_network": false, "host_network": false,