[s2i_content_set] Resolve promoted S2I images for OpenStackVersion - #4167
[s2i_content_set] Resolve promoted S2I images for OpenStackVersion#4167rebtoor wants to merge 1 commit into
Conversation
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? |
870798f to
4de1d9a
Compare
|
Build failed (check pipeline). Post ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 14m 05s |
4de1d9a to
1fbce2f
Compare
|
|
||
| # Explicit s2i-openstack-containers git SHA. Wins over the pin file and | ||
| # over inspecting :master-latest. | ||
| cifmw_s2i_content_set_commit: "" |
There was a problem hiding this comment.
is it needed as it is required? Then in https://github.com/openstack-k8s-operators/ci-framework/pull/4167/changes#diff-b6a992b74941f91b646e1077775f0b481a7ecf09c71c0e3ad5d27250b9781f0dR21 you also set default which is here with same value
There was a problem hiding this comment.
It is optional, not required. Empty means “discover the commit” (pin, then catalog, then probe labels). The | default('') in tasks/main.yml is only a guard if the var is unset; same empty default as defaults/main.yml.
| Add openstack-k8s-operators/s2i-openstack-containers to required-projects. | ||
|
|
||
| - name: Load image mappings | ||
| ansible.builtin.include_vars: |
There was a problem hiding this comment.
nit: suggest to use helpers: https://github.com/openstack-k8s-operators/ci-framework/blob/main/roles/cifmw_helpers/tasks/include_file.yml as include_vars are taking vars on the host where ansible was executed
There was a problem hiding this comment.
include_file.yml is for remote files that contain Jinja, and it does not support name:, so it would dump openstack_version into the play vars. image-mappings.yaml is static YAML and we load it namespaced as cifmw_s2i_content_set_mappings. Same pattern as the pin/catalog loads. This role runs on the job node where the s2i checkout already lives, so include_vars reads the right path.
|
Build failed (check pipeline). Post ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 18m 34s |
Operator jobs need a hash-stable service content set rather than racing quay.io/openstack-s2i-containers :master-latest. Resolve s2iCommit once (from a pin, catalog, or image label), emit cifmw_set_containers_images, and keep unmapped services on payload defaults. Related-Issue: ANVIL-275 Co-authored-by: Cursor <cursoragent@cursor.com> Signed-off-by: Roberto Alfieri <ralfieri@redhat.com> Co-authored-by: Cursor <cursoragent@cursor.com>
1fbce2f to
3e761d3
Compare
|
Build failed (check pipeline). Post ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 00m 54s |
|
recheck |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: michburk The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
Build failed (check pipeline). Post ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 19m 00s |
4 participants
Summary
s2i_content_setrole that resolves a hash-stable S2I content set (s2iCommit+ image digests) from a pin file, a post-merge catalog, or Quay labels, then emitscifmw_set_containers_imagesforedpm_prepare.deploy-edpm.ymlbehindcifmw_s2i_content_setso operator jobs can consumequay.io/openstack-s2i-containerswithout racing:master-latest.OpenStackVersionkeys so unmapped services stay on payload defaults.Related-Issue: ANVIL-275
Test plan
s2i_content_set(catalog + inspect plays)cifmw-molecule-s2i_content_setin Zuulopenstack-operator-tempest-multinodechange (Depends-On)Made with Cursor