Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump ginkgo version to v2.3.0 #2532

Merged
merged 4 commits into from
Oct 13, 2022
Merged

Bump ginkgo version to v2.3.0 #2532

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
569153e
Fix CI by bumping ginkgo version
kerthcet Oct 12, 2022
e3b053f
update vendor
kerthcet Oct 12, 2022
c246e6c
Remove out-of-date license
kerthcet Oct 12, 2022
382ab35
Fix e2e test
kerthcet Oct 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix e2e test 
Signed-off-by: kerthcet <kerthcet@gmail.com>
  • Loading branch information
@kerthcet
kerthcet committed Oct 12, 2022
commit 382ab3599b6cc8d50d218148c88c2718b92b83d5
1 change: 0 additions & 1 deletion test/e2e/schedulingaction/reclaim.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ var _ = Describe("Reclaim E2E Test", func() {
Expect(err).NotTo(HaveOccurred(), "Error waiting for queue running")

for _, pod := range job3pods.Items {
fmt.Println(pod.Name)
err = ctx.Kubeclient.CoreV1().Pods(pod.Namespace).Delete(context.TODO(), pod.Name, metav1.DeleteOptions{})
Expect(err).NotTo(HaveOccurred(), "Failed to delete pod %s", pod.Name)
}
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/util/job.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ func WaitJobPhases(ctx *TestContext, job *batchv1alpha1.Job, phases []batchv1alp

ch := w.ResultChan()
index := 0
timeout := time.After(FiveMinute)
timeout := time.After(TenMinute)

for index < len(phases) {
select {
Expand Down Expand Up @@ -461,7 +461,7 @@ func WaitJobPhases(ctx *TestContext, job *batchv1alpha1.Job, phases []batchv1alp
}

index++
timeout = time.After(FiveMinute)
timeout = time.After(TenMinute)

case <-timeout:
return fmt.Errorf("[Wait time out]: %s", additionalError)
Expand Down
5 changes: 3 additions & 2 deletions test/e2e/util/queue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ package util

import (
"context"
v1 "k8s.io/api/core/v1"
"time"

v1 "k8s.io/api/core/v1"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -119,7 +120,7 @@ func SetQueueReclaimable(ctx *TestContext, queues []string, reclaimable bool) {
}

func WaitQueueStatus(condition func() (bool, error)) error {
return wait.Poll(100*time.Millisecond, FiveMinute, condition)
return wait.Poll(100*time.Millisecond, TenMinute, condition)
}

// queueClosed returns whether the Queue is closed
Expand Down
1 change: 1 addition & 0 deletions test/e2e/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ var (
OneMinute = 1 * time.Minute
TwoMinute = 2 * time.Minute
FiveMinute = 5 * time.Minute
TenMinute = 10 * time.Minute
OneCPU = v1.ResourceList{"cpu": resource.MustParse("1000m")}
TwoCPU = v1.ResourceList{"cpu": resource.MustParse("2000m")}
ThreeCPU = v1.ResourceList{"cpu": resource.MustParse("3000m")}
Expand Down