Skip to content

[reproducer] Pass extra_variable_files to deployment args for PreMetal#4010

Open
srac0 wants to merge 1 commit into
openstack-k8s-operators:mainfrom
srac0:extra-var-files-pre-metal
Open

[reproducer] Pass extra_variable_files to deployment args for PreMetal#4010
srac0 wants to merge 1 commit into
openstack-k8s-operators:mainfrom
srac0:extra-var-files-pre-metal

Conversation

@srac0

@srac0 srac0 commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

PreMetal provisions hosts from the main branch, generating reproducer-variables.yml with base scenario vars. During the actual Zuul job, overwrite_zuul_vars.yml only merges zuul_vars.yaml into reproducer-variables.yml, ignoring extra_variable_files entirely.

This means any scenario override passed via extra_variable_files is silently lost on the controller. The base values from PreMetal provisioning win, causing jobs to run the wrong test plan.

Iteratively merge each extra_variable_files entry into reproducer-variables.yml before the zuul_vars.yaml merge, preserving the correct precedence: base < extra_variable_files < zuul_vars.

evallesp
evallesp previously approved these changes Jun 23, 2026

@evallesp evallesp left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci

openshift-ci Bot commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

New changes are detected. LGTM label has been removed.

@openshift-ci

openshift-ci Bot commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from evallesp. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@srac0 srac0 changed the title [reproducer] Merge extra_variable_files into reproducer-variables.yml for PreMetal [reproducer] Pass extra_variable_files to deployment args for PreMetal Jun 23, 2026
@srac0 srac0 marked this pull request as draft June 23, 2026 08:37
@srac0 srac0 force-pushed the extra-var-files-pre-metal branch from 1d6a9c7 to 4a1192c Compare June 23, 2026 10:15
@centosinfra-prod-github-app

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/14860d26429a4194aeb31748c2e63f58

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 44m 38s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 29m 53s
cifmw-crc-podified-edpm-baremetal FAILURE in 28m 31s
✔️ cifmw-pod-zuul-files SUCCESS in 6m 25s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 9m 15s
✔️ cifmw-pod-pre-commit SUCCESS in 9m 46s
✔️ cifmw-molecule-reproducer SUCCESS in 14m 41s

@srac0 srac0 force-pushed the extra-var-files-pre-metal branch 3 times, most recently from 5979158 to 5eea3b0 Compare June 24, 2026 10:19
@srac0 srac0 marked this pull request as ready for review June 25, 2026 17:22
PreMetal provisions hosts from the main branch, generating
reproducer-variables.yml with base scenario vars. During the actual
Zuul job, overwrite_zuul_vars.yml only merges zuul_vars.yaml into
reproducer-variables.yml, ignoring extra_variable_files entirely.

Additionally, the slurp + copy-content pattern for transferring
reproducer-variables.yml triggers Jinja2 evaluation on the file
content, breaking when the bootstrap bakes raw templates into
nested structures.

Signed-off-by: Samuel Rac <srac@redhat.com>
@centosinfra-prod-github-app

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/f14ee8327bdd4ffa887c9c0ced00532a

openstack-k8s-operators-content-provider FAILURE in 6m 39s
⚠️ podified-multinode-edpm-deployment-crc SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
⚠️ cifmw-crc-podified-edpm-baremetal SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
✔️ cifmw-pod-zuul-files SUCCESS in 4m 36s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 9m 14s
✔️ cifmw-pod-pre-commit SUCCESS in 8m 35s
✔️ cifmw-molecule-reproducer SUCCESS in 14m 52s

@srac0

srac0 commented Jun 26, 2026

Copy link
Copy Markdown
Contributor Author

recheck

@centosinfra-prod-github-app

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/8263ddbd738542429a2634e026c19a32

openstack-k8s-operators-content-provider FAILURE in 4m 33s
⚠️ podified-multinode-edpm-deployment-crc SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
⚠️ cifmw-crc-podified-edpm-baremetal SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
✔️ cifmw-pod-zuul-files SUCCESS in 5m 43s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 10m 22s
✔️ cifmw-pod-pre-commit SUCCESS in 10m 06s
✔️ cifmw-molecule-reproducer SUCCESS in 14m 46s

@michburk

michburk commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

Hey @srac0 I've written up another patch to handle some premetal vars funkyness in the event that config files are updated between premetal provision finishing and being picked up for the remainder of the job, would my patch be able to address this issue as well? The idea with my patch is to mirror the way the hypervisor vars are constructed in configure_bm_ocp_controller.yml

Feel free to reach out to me on slack to talk premetal stuff, and also if you'd like to join the weekly premetal sync meeting to share any updates/blockers/etc, lmk and I can add you on the invite.

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants