[kuttl] Honor cifmw_zuul_target_host_env in operator Make targets - #4122
[kuttl] Honor cifmw_zuul_target_host_env in operator Make targets#4122stuggi wants to merge 1 commit into
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Central YAML (base), Organization UI (inherited) Review profile: CHILL Plan: Pro Plus Run ID: 📒 Files selected for processing (2)
Included review availability: Your plan provides up to 1 included review per hour; 0 remain after this review. 📝 WalkthroughSummary by CodeRabbit
WalkthroughThe KUTTL dependency preparation and test tasks now merge ChangesKUTTL environment propagation
Estimated code review effort: 2 (Simple) | ~10 minutes Merge Risk: ⚪ Minimal · up to The change forwards the selected Make environment into both KUTTL targets so configured suites can run as intended. No actionable merge-blocking risk remains beyond normal checks. 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
with this the correct kuttl tests were triggered in openstack-k8s-operators/nova-operator#1176 --- PASS: kuttl (181.21s) |
|
Build failed (check pipeline). Post ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 11m 23s |
|
recheck |
1 similar comment
|
recheck |
|
Build failed (check pipeline). Post ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 28m 29s |
|
recheck |
|
Build failed (check pipeline). Post ✔️ openstack-k8s-operators-content-provider SUCCESS in 16m 39s |
|
recheck |
The kuttl-from-operator jobs let a Zuul job select the kuttl suite via cifmw_zuul_target_host_env (e.g. KUTTL_SUITE), which is exported into the job parameters (zuul-params.yml) and available to the run/deps plays. However, the tasks that invoke the operator Make targets hardcoded their `environment` to only KUBECONFIG and PATH, so cifmw_zuul_target_host_env was never applied. As a result `make kuttl-test-prep` and `make kuttl-test-run` always used the operator Makefile default (KUTTL_SUITE ?= <default>), silently ignoring the job's override. Concretely, nova-operator's nova-operator-kuttl-placement job sets KUTTL_SUITE=placement but ran the nova suite instead, leaving the placement kuttl suite with zero CI coverage. Merge cifmw_zuul_target_host_env into the environment of both make invocations so a job can override the suite (and any other Make env var) it needs. Related: https://redhat.atlassian.net/browse/OSPRH-33503 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Signed-off-by: Martin Schuppert <mschuppert@redhat.com>
fe8c2a0 to
3b12cd9
Compare
|
rebased |
|
Build failed (check pipeline). Post ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 09m 25s |
|
recheck |
|
Build failed (check pipeline). Post ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 40m 30s |
|
recheck |
|
Build failed (check pipeline). Post ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 30m 47s |
|
needs openstack-k8s-operators/openstack-operator#2042 to land. the barbican kuttl job is using the new operator version, but still the kuttl test files from the barbican operator referenced in the current openstack-operator go.mod |
The kuttl-from-operator jobs let a Zuul job select the kuttl suite via cifmw_zuul_target_host_env (e.g. KUTTL_SUITE), which is exported into the job parameters (zuul-params.yml) and available to the run/deps plays.
However, the tasks that invoke the operator Make targets hardcoded their
environmentto only KUBECONFIG and PATH, so cifmw_zuul_target_host_env was never applied. As a resultmake kuttl-test-prepandmake kuttl-test-runalways used the operator Makefile default (KUTTL_SUITE ?= ), silently ignoring the job's override.Concretely, nova-operator's nova-operator-kuttl-placement job sets KUTTL_SUITE=placement but ran the nova suite instead, leaving the placement kuttl suite with zero CI coverage.
Merge cifmw_zuul_target_host_env into the environment of both make invocations so a job can override the suite (and any other Make env var) it needs.
Related: https://redhat.atlassian.net/browse/OSPRH-33503