Repository navigation
[multiple] Allow overriding individual containers in update_containers - #4287
elfiesmelfie wants to merge 2 commits into
Conversation
When a job patches the `OpenStackVersion` `controlplane` CR with custom container images (e.g. s2i-built images from an operator PR), the resulting `spec.customContainerImages` is only visible by inspecting the must-gather `openstackversions.core.openstack.org/controlplane.yaml`. Jobs like `s2i-speculative-deploy-test-*` gave no in-log indication of which images were applied. Add a debug task in both `OpenStackVersion` writers -- the `update_containers` role (template + `oc apply`) and the `set_containers` call in `edpm_prepare` -- that reads back the generated CR and prints it verbatim, so the patched images are visible directly in the job output. The rendered file is printed as raw lines rather than re-parsed with `from_yaml`, which threw `yaml.scanner.ScannerError` on values containing a colon-space sequence. Assisted-By: Claude Opus 4.8 <noreply@anthropic.com> Signed-off-by: Daniel Pawlik <dpawlik@redhat.com> (cherry picked from commit 8d637b8)
This allows testing images from different sources. Signed-off-by: Yatin Karel <ykarel@redhat.com> (cherry picked from commit c17d9ed)
Qodo reviews are paused for this user.Troubleshooting steps vary by plan Learn more → On a Teams plan? Using GitHub Enterprise Server, GitLab Self-Managed, or Bitbucket Data Center? |
|
[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 |
elfiesmelfie
changed the title
|
@elfiesmelfie where are we using this 18-stable branch of ci-framework? |
|
@karelyatin Do we not plan to have a similar branching strategy as the rest of RHOSO? (To have a separate branch for 18 with different content to what's used for 19?) |
| watcherApplierImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/{{ cifmw_update_containers_name_prefix }}-watcher-applier:{{ cifmw_update_containers_tag }} | ||
| watcherDecisionEngineImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/{{ cifmw_update_containers_name_prefix }}-watcher-decision-engine:{{ cifmw_update_containers_tag }} | ||
| {% endif %} | ||
| {% if cifmw_update_containers_custom_images is defined and cifmw_update_containers_custom_images is mapping %} |
There was a problem hiding this comment.
the cifmw_update_containers_custom_images is defined in defaults. Maybe we can improve the condition as following:
cifmw_update_containers_custom_images | length > 0
I'm confused by the existence of both a stable and an 18-stable branch. I picked 18-stable because it matched the branches in the other required projects. |
This PR backports features from main that allow specifying individual
containers to update when using the update_containers role.
This allows to updating only some images (e.g. telemetry and optimize
components both deploy changes from newer versions than antelope),
while keeping the same default set of images for the rest of the services.
This backports changes from two PRs:
#4099
#4152