From 279cf2d39ff4ddd0e31b54b31a7c63f357069282 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Fri, 25 Feb 2022 13:24:51 -0800 Subject: [PATCH 1/3] Ignore arm64 flake test results for now --- hack/jenkins/test-flake-chart/compute_flake_rate.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hack/jenkins/test-flake-chart/compute_flake_rate.go b/hack/jenkins/test-flake-chart/compute_flake_rate.go index 3b1f090401..09d4e137ff 100644 --- a/hack/jenkins/test-flake-chart/compute_flake_rate.go +++ b/hack/jenkins/test-flake-chart/compute_flake_rate.go @@ -73,7 +73,7 @@ type testEntry struct { duration float32 } -// A map with keys of (environment, test_name) to values of slcies of TestEntry. +// A map with keys of (environment, test_name) to values of slices of TestEntry. type splitEntryMap map[string]map[string][]testEntry // Reads CSV `file` and consumes each line to be a single TestEntry. @@ -168,6 +168,10 @@ func filterRecentEntries(splitEntries splitEntryMap, dateCutoff time.Time) split filteredEntries := make(splitEntryMap) for environment, environmentSplit := range splitEntries { + // Ignore arm64 tests until they're back under control + if strings.Contains(environment, "arm64") { + continue + } for test, testSplit := range environmentSplit { for _, entry := range testSplit { if !entry.date.Before(dateCutoff) { From 033f0300f9e00a41aab96f8f1cf515db987d93ac Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Fri, 25 Feb 2022 13:40:43 -0800 Subject: [PATCH 2/3] switch it to kvm linux crio --- hack/jenkins/test-flake-chart/compute_flake_rate.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/jenkins/test-flake-chart/compute_flake_rate.go b/hack/jenkins/test-flake-chart/compute_flake_rate.go index 09d4e137ff..1ab72a2ecb 100644 --- a/hack/jenkins/test-flake-chart/compute_flake_rate.go +++ b/hack/jenkins/test-flake-chart/compute_flake_rate.go @@ -168,8 +168,8 @@ func filterRecentEntries(splitEntries splitEntryMap, dateCutoff time.Time) split filteredEntries := make(splitEntryMap) for environment, environmentSplit := range splitEntries { - // Ignore arm64 tests until they're back under control - if strings.Contains(environment, "arm64") { + // Ignore kvm crio tests until they're back under control + if environment == "KVM_Linux_crio" { continue } for test, testSplit := range environmentSplit { From 3a0253f0a42080326a97d8439fcb54a74f02b518 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Fri, 25 Feb 2022 14:52:04 -0800 Subject: [PATCH 3/3] lengthen timeouts for docker and podman gh action tests --- .github/workflows/master.yml | 4 ++-- .github/workflows/pr.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index d4b7a6643a..81c61a5ac3 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -142,7 +142,7 @@ jobs: sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/ sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld START_TIME=$(date -u +%s) - KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--vm-driver=docker -test.run TestFunctional -test.timeout=10m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--vm-driver=docker -test.run TestFunctional -test.timeout=15m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) TIME_ELAPSED=$(($END_TIME-$START_TIME)) min=$((${TIME_ELAPSED}/60)) @@ -343,7 +343,7 @@ jobs: sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/ sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld START_TIME=$(date -u +%s) - KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--vm-driver=podman -v=6 --alsologtostderr -test.run TestFunctional -test.timeout=10m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--vm-driver=podman -v=6 --alsologtostderr -test.run TestFunctional -test.timeout=15m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) TIME_ELAPSED=$(($END_TIME-$START_TIME)) min=$((${TIME_ELAPSED}/60)) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 92755126ac..0071977229 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -140,7 +140,7 @@ jobs: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld MINIKUBE_HOME=$(pwd)/testhome ./minikube-linux-amd64 delete --all --purge START_TIME=$(date -u +%s) - KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--vm-driver=docker -test.run TestFunctional -test.timeout=10m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--vm-driver=docker -test.run TestFunctional -test.timeout=15m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) TIME_ELAPSED=$(($END_TIME-$START_TIME)) min=$((${TIME_ELAPSED}/60)) @@ -343,7 +343,7 @@ jobs: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld MINIKUBE_HOME=$(pwd)/testhome ./minikube-linux-amd64 delete --all --purge START_TIME=$(date -u +%s) - KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--vm-driver=podman -v=6 --alsologtostderr -test.run TestFunctional -test.timeout=10m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--vm-driver=podman -v=6 --alsologtostderr -test.run TestFunctional -test.timeout=15m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) TIME_ELAPSED=$(($END_TIME-$START_TIME)) min=$((${TIME_ELAPSED}/60))