Skip to content

Commit 625367d

Browse files
shmuelkshmuelk
committed
Filtering end to end tests is no longer needed
Signed-off-by: Shmuel Kallner <kallner@il.ibm.com>
1 parent feafdf4 commit 625367d

5 files changed

Lines changed: 17 additions & 24 deletions

File tree

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ E2E_NUM_PROCS ?= 5
126126
# Should we pass ALL env vars here?
127127
E2E_ENV_VARS = EPP_IMAGE VLLM_IMAGE SIDECAR_IMAGE VLLM_RENDER_IMAGE \
128128
E2E_KEEP_CLUSTER_ON_FAILURE E2E_PORT E2E_METRICS_PORT K8S_CONTEXT READY_TIMEOUT \
129-
E2E_NUM_PROCS E2E_LABEL_FILTER LOAD_VLLM_RENDER_IMAGE HF_TOKEN
129+
E2E_NUM_PROCS LOAD_VLLM_RENDER_IMAGE HF_TOKEN
130130
BUILDER_E2E_ENV_FLAGS = $(foreach v,$(E2E_ENV_VARS),$(if $($(v)),-e '$(v)=$($(v))'))
131131
ifneq ($(filter command line environment,$(origin NAMESPACE)),)
132132
BUILDER_E2E_ENV_FLAGS += -e NAMESPACE=$(NAMESPACE)

‎test/e2e/disruption_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ func completionRoutedToNamespace(nsName string) error {
9696
return nil
9797
}
9898

99-
var _ = ginkgo.Describe("Disruption tests", ginkgo.Label(disruptiveTestLabel), func() {
99+
var _ = ginkgo.Describe("Disruption tests", func() {
100100
ginkgo.When("A decode pod is killed mid-request", ginkgo.Ordered, testWrapper(func() {
101101
ginkgo.It("should recover and route to surviving pods", func() {
102102
nsName := getNamespace()

‎test/e2e/e2e_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ var _ = ginkgo.Describe("Run end to end tests", func() {
161161
})
162162
}))
163163

164-
ginkgo.When("Running a PD configuration with nixlv2 connector(deprecated pd-profile-handler)", ginkgo.Label(metricsTestLabel, deprecatedPDTestLabel), ginkgo.Ordered, testWrapper(func() {
164+
ginkgo.When("Running a PD configuration with nixlv2 connector(deprecated pd-profile-handler)", ginkgo.Ordered, testWrapper(func() {
165165
ginkgo.It("should run successfully", func() {
166166
infPoolObjects := createInferencePool(1)
167167

@@ -240,7 +240,7 @@ var _ = ginkgo.Describe("Run end to end tests", func() {
240240
} {
241241
config := tc.config // capture for closure
242242
label := tc.label
243-
ginkgo.When("Running a PD configuration with shared-storage connector using "+tc.name, ginkgo.Label(sharedStorageTestLabel, label), ginkgo.Ordered, testWrapper(func() {
243+
ginkgo.When("Running a PD configuration with shared-storage connector using "+tc.name, ginkgo.Ordered, testWrapper(func() {
244244
ginkgo.It("should run regular (non-streaming) requests successfully", func() {
245245
infPoolObjects := createInferencePool(1)
246246

@@ -475,7 +475,7 @@ var _ = ginkgo.Describe("Run end to end tests", func() {
475475
})
476476
}))
477477

478-
ginkgo.When("Running a PD configuration with disagg-profile-handler and metrics validation", ginkgo.Label(metricsTestLabel, disaggTestLabel), ginkgo.Ordered, testWrapper(func() {
478+
ginkgo.When("Running a PD configuration with disagg-profile-handler and metrics validation", ginkgo.Ordered, testWrapper(func() {
479479

480480
ginkgo.It("should run successfully", func() {
481481
infPoolObjects := createInferencePool(1)
@@ -572,7 +572,7 @@ var _ = ginkgo.Describe("Run end to end tests", func() {
572572
})
573573
}))
574574

575-
ginkgo.When("Running an E/PD (Encode/Prefill-Decode) configuration", ginkgo.Label(extendedTestLabel), ginkgo.Ordered, testWrapper(func() {
575+
ginkgo.When("Running an E/PD (Encode/Prefill-Decode) configuration", ginkgo.Ordered, testWrapper(func() {
576576
ginkgo.It("should route multimodal requests through encode and decode pods", func() {
577577
infPoolObjects := createInferencePool(1)
578578

@@ -647,7 +647,7 @@ var _ = ginkgo.Describe("Run end to end tests", func() {
647647
})
648648
}))
649649

650-
ginkgo.When("Running an E/P/D (encode/prefill/decode) configuration", ginkgo.Label(extendedTestLabel), ginkgo.Ordered, testWrapper(func() {
650+
ginkgo.When("Running an E/P/D (encode/prefill/decode) configuration", ginkgo.Ordered, testWrapper(func() {
651651
ginkgo.It("should route multimodal requests through encode, prefill, and decode pods", func() {
652652
infPoolObjects := createInferencePool(1)
653653

@@ -732,7 +732,7 @@ var _ = ginkgo.Describe("Run end to end tests", func() {
732732
})
733733
}))
734734

735-
ginkgo.When("Running an EPD (no disaggregation) configuration", ginkgo.Label(extendedTestLabel), ginkgo.Ordered, testWrapper(func() {
735+
ginkgo.When("Running an EPD (no disaggregation) configuration", ginkgo.Ordered, testWrapper(func() {
736736
ginkgo.It("should route text and multimodal requests to the single deployment", func() {
737737
infPoolObjects := createInferencePool(1)
738738

@@ -800,7 +800,7 @@ var _ = ginkgo.Describe("Run end to end tests", func() {
800800
})
801801
}))
802802

803-
ginkgo.When("Running simple non-PD KV enabled configuration", ginkgo.Label(extendedTestLabel), ginkgo.Ordered, testWrapper(func() {
803+
ginkgo.When("Running simple non-PD KV enabled configuration", ginkgo.Ordered, testWrapper(func() {
804804
ginkgo.It("should run successfully", func() {
805805
infPoolObjects := createInferencePool(1)
806806

@@ -824,7 +824,7 @@ var _ = ginkgo.Describe("Run end to end tests", func() {
824824
})
825825
}))
826826

827-
ginkgo.When("Running KV configuration with external tokenizer DataProducer plugin", ginkgo.Label(extendedTestLabel), ginkgo.Ordered, testWrapper(func() {
827+
ginkgo.When("Running KV configuration with external tokenizer DataProducer plugin", ginkgo.Ordered, testWrapper(func() {
828828
ginkgo.It("should run successfully", func() {
829829
infPoolObjects := createInferencePool(1)
830830

@@ -859,7 +859,7 @@ var _ = ginkgo.Describe("Run end to end tests", func() {
859859
})
860860
}))
861861

862-
ginkgo.When("Scaling up and down the model servers", ginkgo.Label(extendedTestLabel), ginkgo.Ordered, testWrapper(func() {
862+
ginkgo.When("Scaling up and down the model servers", ginkgo.Ordered, testWrapper(func() {
863863
ginkgo.It("should distribute inference requests across all model servers", func() {
864864
infPoolObjects := createInferencePool(1)
865865

@@ -917,7 +917,7 @@ var _ = ginkgo.Describe("Run end to end tests", func() {
917917
})
918918
}))
919919

920-
ginkgo.When("Running a vLLM Data Parallel configuration", ginkgo.Label(extendedTestLabel), ginkgo.Ordered, testWrapper(func() {
920+
ginkgo.When("Running a vLLM Data Parallel configuration", ginkgo.Ordered, testWrapper(func() {
921921
ginkgo.It("should schedule inference on all ranks", func() {
922922
infPoolObjects := createInferencePool(2)
923923

‎test/e2e/generate_endpoint_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ var twoImages = []imageSpec{
4343
{Hash: "e2e-image-hash-1", Offset: 4, Length: 5},
4444
}
4545

46-
var _ = ginkgo.Describe("Direct gateway /inference/v1/generate encode against encode-only", ginkgo.Label(extendedTestLabel), ginkgo.Ordered, testWrapper(func() {
46+
var _ = ginkgo.Describe("Direct gateway /inference/v1/generate encode against encode-only", ginkgo.Ordered, testWrapper(func() {
4747
// Uses single-profile-handler (generateEncodeConfig) so the EPP routes
4848
// directly to encode pods without requiring a decode stage first.
4949
ginkgo.It("returns ec_transfer_params for encode bodies", func() {
@@ -77,7 +77,7 @@ var _ = ginkgo.Describe("Direct gateway /inference/v1/generate encode against en
7777
})
7878
}))
7979

80-
var _ = ginkgo.Describe("Direct gateway /inference/v1/generate prefill against prefill-only", ginkgo.Label(extendedTestLabel), ginkgo.Ordered, testWrapper(func() {
80+
var _ = ginkgo.Describe("Direct gateway /inference/v1/generate prefill against prefill-only", ginkgo.Ordered, testWrapper(func() {
8181
// Uses single-profile-handler (generatePrefillConfig) so the EPP routes
8282
// directly to prefill pods without requiring a decode stage first.
8383
ginkgo.It("returns kv_transfer_params for prefill bodies", func() {
@@ -237,7 +237,7 @@ func expectKVTransferParams(parsed map[string]any, raw []byte) {
237237
"kv_transfer_params is empty: %s", string(raw))
238238
}
239239

240-
var _ = ginkgo.Describe("P/D gateway /inference/v1/generate disaggregates via sidecar", ginkgo.Label(sharedStorageTestLabel, disaggTestLabel), ginkgo.Ordered, testWrapper(func() {
240+
var _ = ginkgo.Describe("P/D gateway /inference/v1/generate disaggregates via sidecar", ginkgo.Ordered, testWrapper(func() {
241241
// Regression test for https://github.com/llm-d/llm-d-router/issues/1461:
242242
// the pd-sidecar previously had no route for /inference/v1/generate, so
243243
// token-in P/D requests silently fell through to decode-only. This test

‎test/scripts/e2e-common.sh‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,8 @@ e2e_handle_interrupt() {
2929
exit 130 # SIGINT (Ctrl+C)
3030
}
3131

32-
# run_ginkgo_suite runs the Ginkgo e2e suite in the given package directory,
33-
# applying E2E_LABEL_FILTER when set.
32+
# run_ginkgo_suite runs the Ginkgo e2e suite in the given package directory.
3433
run_ginkgo_suite() {
3534
local pkg="$1"
36-
if [ -n "${E2E_LABEL_FILTER:-}" ]; then
37-
echo "Label filter: ${E2E_LABEL_FILTER}"
38-
# Tests not being run in parallel using Ginkgo
39-
E2E_NUM_PROCS=1 go test -v -timeout 45m "${pkg}" -ginkgo.v -ginkgo.fail-fast "-ginkgo.label-filter=${E2E_LABEL_FILTER}"
40-
else
41-
ginkgo run --procs="${E2E_NUM_PROCS}" --timeout 45m -v --fail-fast "${pkg}"
42-
fi
35+
ginkgo run --procs="${E2E_NUM_PROCS}" --timeout 45m -v --fail-fast "${pkg}"
4336
}

0 commit comments

Comments
 (0)