[ci] Omit unready images from deploy-validation injection - #130
Draft
rebtoor wants to merge 1 commit into
Draft
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 |
rebtoor
force-pushed
the
skip-unready-osversion-images
branch
from
August 26, 2026 12:48
6a6b6ac to
75037ba
Compare
Contributor
Author
|
recheck |
rebtoor
force-pushed
the
skip-unready-osversion-images
branch
from
August 26, 2026 19:27
75037ba to
802bf80
Compare
rebtoor
changed the title
rebtoor
force-pushed
the
skip-unready-osversion-images
branch
from
August 26, 2026 19:34
802bf80 to
ab210ff
Compare
rebtoor
force-pushed
the
skip-unready-osversion-images
branch
from
August 27, 2026 14:34
ab210ff to
1c6ad19
Compare
rebtoor
changed the title
rebtoor
force-pushed
the
skip-unready-osversion-images
branch
from
August 27, 2026 14:38
2f763eb to
0b2ae27
Compare
s2i-openstack-deploy-validation patches OpenStackVersion with mapped s2i images. neutron-server, neutron metadata-agent, MariaDB/Galera, and glance-api are not ready to consume those images yet, so injecting them fails the repo gate. Keep the mappings in image-mappings.yaml so operator consumer jobs can still inject them. Add s2i_ci_skip_os_custom_images (empty on s2i-speculative-deploy-test-base) and set it only on s2i-openstack-deploy-validation: - neutronAPIImage - edpmNeutronMetadataAgentImage - mariadbImage - glanceAPIImage Skipped keys are dropped from cifmw_set_containers_images, so preserve_unlisted keeps payload defaults. Do not pin quay master-latest in place of the mappings. When those images can be consumed, remove the keys from the skip list. Glance is omitted because the s2i image has no kolla_extend_start KOLLA_BOOTSTRAP handler, so glance-db-sync execs the operator compound command without a shell and glance-manage fails. Tests and operator-onboarding docs lock that the skip list stays job-local and is not copied into <service>-s2i-tempest. Co-authored-by: Cursor <cursoragent@cursor.com>
rebtoor
force-pushed
the
skip-unready-osversion-images
branch
from
August 27, 2026 19:48
0b2ae27 to
97b807f
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
s2i-openstack-deploy-validationinjects mapped s2i images intoOpenStackVersionduringedpm_prepare. Neutron API, neutronmetadata-agent, and MariaDB/Galera cannot consume those images yet, so
this job now omits those three keys and leaves payload defaults in
place via
cifmw_set_containers_preserve_unlisted: true.The mappings stay in
containers/image-mappings.yaml. The contentprovider still returns every mapped key. Only this repo's
deploy-validation job filters them.
Mechanism
s2i-speculative-deploy-test-baseaddss2i_ci_skip_os_custom_images: []and filters with
rejectattr('key', 'in', s2i_ci_skip_os_custom_images).s2i-openstack-deploy-validationoverrides the list:neutronAPIImage,edpmNeutronMetadataAgentImage,mariadbImage.snippet) should leave the skip list unset/empty so they inject the
full map.
Do not replace the mappings with
quay.iomaster-latestpins.When neutron-operator / mariadb-operator can consume the s2i images,
delete the keys from the skip list rather than deleting the mappings.
Why not copy neutron-operator#684
openstack-k8s-operators/neutron-operator#684 is
a DNM that pins
master-latestand comments out neutron-server /metadata. This PR is the inverse: keep real s2i mappings for consumers,
skip them only in this repo's full-stack gate.
Test plan
tox -e linterstox -e test(includestests/test_deployment_keys.sh)s2i-openstack-deploy-validationno longer patches thethree skipped keys and still injects the other neutron/OVN images
s2i_ci_skip_os_custom_images