From 9f292b22dd36c510316fd40de96edba025a97424 Mon Sep 17 00:00:00 2001 From: Laurentiu Bradin <109964136+z103cb@users.noreply.github.com> Date: Fri, 5 May 2023 16:04:35 +0300 Subject: [PATCH 1/3] Increase the timeout limit. --- kuttl-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kuttl-test.yaml b/kuttl-test.yaml index 3520d6f88..2356762b6 100644 --- a/kuttl-test.yaml +++ b/kuttl-test.yaml @@ -2,4 +2,4 @@ apiVersion: kuttl.dev/v1beta1 kind: TestSuite testDirs: - ./test/e2e-kuttl/ -timeout: 180 +timeout: 240 From b981896466b6a21b42cb16efe04f38181b1b3e70 Mon Sep 17 00:00:00 2001 From: Laurentiu Bradin <109964136+z103cb@users.noreply.github.com> Date: Mon, 8 May 2023 14:50:06 +0300 Subject: [PATCH 2/3] Increased timeout to 360 seconds. --- kuttl-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kuttl-test.yaml b/kuttl-test.yaml index 2356762b6..6ef999ede 100644 --- a/kuttl-test.yaml +++ b/kuttl-test.yaml @@ -2,4 +2,4 @@ apiVersion: kuttl.dev/v1beta1 kind: TestSuite testDirs: - ./test/e2e-kuttl/ -timeout: 240 +timeout: 360 From 4443d4836c35a40956808ff38e1a2ef6da7f5f06 Mon Sep 17 00:00:00 2001 From: Laurentiu Bradin <109964136+z103cb@users.noreply.github.com> Date: Mon, 8 May 2023 22:13:16 +0300 Subject: [PATCH 3/3] Addressed build failures: - Increased timeout for kuttl steps - increased CPU requests for the fast preemption tests - reduced the number of app wrappers submitted, simplified code --- hack/run-e2e-kind.sh | 2 +- kuttl-test.yaml | 2 +- test/e2e/queue.go | 24 +++++++----------------- 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/hack/run-e2e-kind.sh b/hack/run-e2e-kind.sh index 3bb99a9d2..90af63a4e 100755 --- a/hack/run-e2e-kind.sh +++ b/hack/run-e2e-kind.sh @@ -556,4 +556,4 @@ kuttl-tests mcad-quota-management-down mcad-up echo "==========================>>>>> Running E2E tests... <<<<<==========================" -go test ./test/e2e -v -timeout 75m -count=1 \ No newline at end of file +go test ./test/e2e -v -timeout 120m -count=1 \ No newline at end of file diff --git a/kuttl-test.yaml b/kuttl-test.yaml index 6ef999ede..4d2ca84a6 100644 --- a/kuttl-test.yaml +++ b/kuttl-test.yaml @@ -2,4 +2,4 @@ apiVersion: kuttl.dev/v1beta1 kind: TestSuite testDirs: - ./test/e2e-kuttl/ -timeout: 360 +timeout: 420 diff --git a/test/e2e/queue.go b/test/e2e/queue.go index 011b86147..9a91af7be 100644 --- a/test/e2e/queue.go +++ b/test/e2e/queue.go @@ -431,7 +431,7 @@ var _ = Describe("AppWrapper E2E Test", func() { // This should not fit on any node but should dispatch because there is enough aggregated resources. aw2 := createGenericDeploymentCustomPodResourcesWithCPUAW( - context, "aw-ff-deployment-1-700-cpu", "700m", "700m", 1, 60) + context, "aw-ff-deployment-1-850-cpu", "850m", "850m", 1, 60) appwrappers = append(appwrappers, aw2) @@ -728,8 +728,8 @@ var _ = Describe("AppWrapper E2E Test", func() { }) - It("Create AppWrapper - Generic 100 Deployment Only - 2 pods each", func() { - fmt.Fprintf(os.Stdout, "[e2e] Generic 100 Deployment Only - 2 pods each - Started.\n") + It("Create AppWrapper - Generic 50 Deployment Only - 2 pods each", func() { + fmt.Fprintf(os.Stdout, "[e2e] Generic 50 Deployment Only - 2 pods each - Started.\n") context := initTestContext() var aws []*arbv1.AppWrapper @@ -737,27 +737,16 @@ var _ = Describe("AppWrapper E2E Test", func() { defer cleanupTestObjectsPtr(context, appwrappersPtr) const ( - awCount = 100 + awCount = 50 reportingInterval = 10 + cpuDemand = "5m" ) replicas := 2 modDivisor := int(awCount / reportingInterval) for i := 0; i < awCount; i++ { - name := fmt.Sprintf("%s%d-", "aw-generic-deployment-", replicas) + name := fmt.Sprintf("aw-generic-deployment-%02d-%03d", replicas, i+1) - // Pad name with '0' when i < 100 - if i < (awCount - 1) { - name = fmt.Sprintf("%s%s", name, "0") - } - - // Pad name with '0' when i < 10 - if i < (reportingInterval - 1) { - name = fmt.Sprintf("%s%s", name, "0") - } - - name = fmt.Sprintf("%s%d", name, i+1) - cpuDemand := "5m" if ((i+1)%modDivisor) == 0 || i == 0 { fmt.Fprintf(GinkgoWriter, "[e2e] Creating AW %s with %s cpu and %d replica(s).\n", name, cpuDemand, replicas) } @@ -766,6 +755,7 @@ var _ = Describe("AppWrapper E2E Test", func() { } // Give the deployments time to create pods + // FIXME: do not assume that the pods are in running state in the order of submission. time.Sleep(2 * time.Minute) for i := 0; i < len(aws); i++ { err := waitAWReadyQuiet(context, aws[i])