Skip to content

Commit 2447538

Browse files
committed
Test test-e2e-customconfigs
1 parent 9f88ffa commit 2447538

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

Makefile-test.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,8 @@ run-test-e2e-customconfigs-%: K8S_VERSION = $(@:run-test-e2e-customconfigs-%=%)
204204
run-test-e2e-customconfigs-%:
205205
@echo Running customconfigs e2e for k8s ${K8S_VERSION}
206206
E2E_KIND_VERSION="kindest/node:v$(K8S_VERSION)" KIND_CLUSTER_NAME=$(KIND_CLUSTER_NAME) CREATE_KIND_CLUSTER=$(CREATE_KIND_CLUSTER) \
207-
ARTIFACTS="$(ARTIFACTS)/$@" IMAGE_TAG=$(IMAGE_TAG) GINKGO_ARGS="$(GINKGO_ARGS)" \
207+
ARTIFACTS="$(ARTIFACTS)/$@" IMAGE_TAG=$(IMAGE_TAG) \
208+
GINKGO_ARGS="--repeat=50" \
208209
KIND_CLUSTER_FILE="kind-cluster.yaml" E2E_TARGET_FOLDER="customconfigs" \
209210
JOBSET_VERSION=$(JOBSET_VERSION) APPWRAPPER_VERSION=$(APPWRAPPER_VERSION) \
210211
LEADERWORKERSET_VERSION=$(LEADERWORKERSET_VERSION) \

pkg/workload/workload.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1030,12 +1030,14 @@ func mergePatchStatus(ctx context.Context, c client.Client, wl *kueue.Workload,
10301030
patchOptions = append(patchOptions, clientutil.WithRetryOnConflict())
10311031
}
10321032
return clientutil.PatchStatus(ctx, c, wl, func() (bool, error) {
1033+
time.Sleep(time.Second)
10331034
return update(wl)
10341035
}, patchOptions...)
10351036
}
10361037

10371038
func applyPatchStatus(ctx context.Context, c client.Client, wl *kueue.Workload, owner client.FieldOwner, update UpdateFunc) error {
10381039
if updated, err := update(wl); err != nil || !updated {
1040+
time.Sleep(time.Second)
10391041
return err
10401042
}
10411043
return c.Status().Patch(ctx, wl, client.Apply, owner, client.ForceOwnership)

test/e2e/customconfigs/waitforpodsready_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ var _ = ginkgo.Describe("WaitForPodsReady with tiny Timeout and no RecoveryTimeo
132132
util.ExpectObjectToBeDeleted(ctx, k8sClient, metricsReaderClusterRoleBinding, true)
133133
})
134134

135-
ginkgo.It("should evict and requeue workload when pods readiness timeout is surpassed", func() {
135+
ginkgo.FIt("should evict and requeue workload when pods readiness timeout is surpassed", func() {
136136
ginkgo.By("creating a suspended job so its pods never report Ready", func() {
137137
job = testingjob.MakeJob("job-timeout", ns.Name).
138138
Queue(kueue.LocalQueueName(lq.Name)).
@@ -238,7 +238,7 @@ var _ = ginkgo.Describe("WaitForPodsReady with default Timeout and a tiny Recove
238238
cfg.WaitForPodsReady = &configapi.WaitForPodsReady{
239239
Timeout: metav1.Duration{Duration: 5 * time.Minute},
240240
BlockAdmission: ptr.To(true),
241-
RecoveryTimeout: &metav1.Duration{Duration: util.TinyTimeout},
241+
RecoveryTimeout: &metav1.Duration{Duration: time.Nanosecond},
242242
RequeuingStrategy: &configapi.RequeuingStrategy{
243243
Timestamp: ptr.To(configapi.EvictionTimestamp),
244244
BackoffBaseSeconds: ptr.To(int32(1)),
@@ -288,7 +288,7 @@ var _ = ginkgo.Describe("WaitForPodsReady with default Timeout and a tiny Recove
288288
util.ExpectObjectToBeDeleted(ctx, k8sClient, metricsReaderClusterRoleBinding, true)
289289
})
290290

291-
ginkgo.It("should evict and requeue workload when pod failure causes recovery timeout", func() {
291+
ginkgo.FIt("should evict and requeue workload when pod failure causes recovery timeout", func() {
292292
ginkgo.By("creating a job", func() {
293293
job = testingjob.MakeJob("job-recovery-timeout", ns.Name).
294294
Image(util.GetAgnHostImage(), util.BehaviorWaitForDeletion).

0 commit comments

Comments
 (0)