Skip to content

[oadp-1.6] fix(e2e): TEST_VIRT excludes kdm specs, enable split-job e2e (issue #2413 option B) #2424

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

Merged
openshift-merge-bot merged 2 commits into from
Sep 1, 2026
+22 −7
Merged

[oadp-1.6] fix(e2e): TEST_VIRT excludes kdm specs, enable split-job e2e (issue #2413 option B) #2424

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
580520d
fix(e2e): TEST_VIRT excludes kdm specs, split-job support
kaovilai Aug 31, 2026
cb3554a
fix(e2e): distinguish unset vs explicit TEST_VIRT_KDM=false
kaovilai Aug 31, 2026
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
29 changes: 22 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -931,9 +931,17 @@ TEST_VIRT ?= false
# TEST_VIRT_KDM runs only the kubevirt-datamover-specific specs (ginkgo label
# "kdm", a subset of "virt") -- for CI jobs that build/test against the
# kubevirt-datamover-controller/-plugin repos specifically and don't need the
# full TEST_VIRT suite's runtime. TEST_VIRT=true already covers these specs
# too, since they carry both labels -- this only matters when TEST_VIRT_KDM
# is set WITHOUT TEST_VIRT.
# full TEST_VIRT suite's runtime. Tri-state, distinguished via $(origin):
# unset -> TEST_VIRT=true includes kdm specs too (legacy behavior,
# what existing openshift/release jobs rely on today)
# explicit false -> TEST_VIRT=true excludes kdm specs, for a split non-kdm
# CI job
# explicit true -> kdm specs only, regardless of TEST_VIRT/TEST_VIRT_GA
# This lets a new split kdm-only job opt in (TEST_VIRT_KDM=true) and a new
# split non-kdm job opt out (TEST_VIRT_KDM=false) without changing what
# existing jobs that don't set this var at all get today -- see
# https://github.com/openshift/oadp-operator/issues/2413 option B.
TEST_VIRT_KDM_ORIGIN := $(origin TEST_VIRT_KDM)
TEST_VIRT_KDM ?= false
HCO_INDEX_TAG ?= 1.18.0
# hcp
Expand All @@ -955,12 +963,19 @@ FAIL_FAST ?= true
TEST_FILTER = (($(shell echo '! aws && ! gcp && ! azure && ! ibmcloud' | \
$(SED) -r "s/[&]* [!] $(CLUSTER_TYPE)|[!] $(CLUSTER_TYPE) [&]*//")) || $(CLUSTER_TYPE))
#TEST_FILTER := $(shell echo '! aws && ! gcp && ! azure' | $(SED) -r "s/[&]* [!] $(CLUSTER_TYPE)|[!] $(CLUSTER_TYPE) [&]*//")
ifeq ($(TEST_VIRT),true)
TEST_FILTER += && (virt)
# TEST_VIRT_KDM=true takes precedence: it isolates the kdm job regardless of
# TEST_VIRT/TEST_VIRT_GA. Otherwise TEST_VIRT includes kdm specs unless
# TEST_VIRT_KDM was explicitly set to false (see TEST_VIRT_KDM_ORIGIN above).
ifeq ($(TEST_VIRT_KDM),true)
TEST_FILTER += && (kdm)
else ifeq ($(TEST_VIRT),true)
ifeq ($(TEST_VIRT_KDM_ORIGIN),undefined)
TEST_FILTER += && (virt)
else
TEST_FILTER += && (virt) && (! kdm)
endif
else ifeq ($(TEST_VIRT_GA),true)
TEST_FILTER += && (virt)
else ifeq ($(TEST_VIRT_KDM),true)
TEST_FILTER += && (kdm)
else
TEST_FILTER += && (! virt)
endif
Expand Down