From 09a8d1a751b33181d319c7d9c6bf644230260f88 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Fri, 8 Sep 2017 11:46:43 +0200 Subject: [PATCH] contrib: test: run kube tests in CI with same cgroup driver Our CI tests on RHEL and Fedora and we want to test the systemd cgroup driver. However, kubelet needs to run in tests with systemd cgroup driver as well, or tests fail. This patch fixes broken CI because of not matching cgroup driver between CRI-O and the kubelet. Signed-off-by: Antonio Murdaca --- contrib/test/crio-integration-playbook.yaml | 2 +- test/ctr.bats | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/test/crio-integration-playbook.yaml b/contrib/test/crio-integration-playbook.yaml index 04dfb452..af65ac20 100644 --- a/contrib/test/crio-integration-playbook.yaml +++ b/contrib/test/crio-integration-playbook.yaml @@ -409,7 +409,7 @@ poll: 10 - name: run k8s tests shell: | - make test-e2e-node PARALLELISM=1 RUNTIME=remote CONTAINER_RUNTIME_ENDPOINT=/var/run/crio.sock IMAGE_SERVICE_ENDPOINT=/var/run/crio.sock TEST_ARGS="--prepull-images=true" FOCUS="\[Conformance\]" 2>&1 > node-e2e.log + make test-e2e-node PARALLELISM=1 RUNTIME=remote CONTAINER_RUNTIME_ENDPOINT=/var/run/crio.sock IMAGE_SERVICE_ENDPOINT=/var/run/crio.sock TEST_ARGS='--prepull-images=true --kubelet-flags="--cgroup-driver=systemd"' FOCUS="\[Conformance\]" 2>&1 > node-e2e.log args: chdir: /root/src/k8s.io/kubernetes async: 7200 diff --git a/test/ctr.bats b/test/ctr.bats index cf14c3ce..0707df5d 100644 --- a/test/ctr.bats +++ b/test/ctr.bats @@ -719,7 +719,7 @@ function teardown() { echo "$output" [ "$status" -eq 0 ] # Wait for container to OOM - run sleep 10 + run sleep 100 run crioctl ctr status --id "$ctr_id" echo "$output" [ "$status" -eq 0 ]