Consolidate shiftstack adoption CI fixes - #30
Draft
imatza-rh 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 |
imatza-rh
force-pushed
the
remove-ocpbugs-67159-workaround
branch
from
August 5, 2026 10:20
a3a26e1 to
8eadd43
Compare
imatza-rh
force-pushed
the
remove-ocpbugs-67159-workaround
branch
from
August 5, 2026 18:15
8eadd43 to
d0ba31d
Compare
imatza-rh
force-pushed
the
remove-ocpbugs-67159-workaround
branch
from
August 26, 2026 12:55
3acf99e to
856950f
Compare
imatza-rh
force-pushed
the
remove-ocpbugs-67159-workaround
branch
from
September 9, 2026 09:27
10c344d to
000ecc4
Compare
https://issues.redhat.com/browse/OSPRH-34580 Remove the OCPBUGS-67159 VIP workaround, keep openstack_test as a post-adoption verification stage, skip pull-secret extraction when a pull secret is already injected, and include the Swift registry matcher plus Manila empty-catalog guards found during TP validation. Related-Issue: OSPRH-25360 Related-Issue: OSPRH-27365 Signed-off-by: Itay Matza <imatza@redhat.com>
imatza-rh
force-pushed
the
remove-ocpbugs-67159-workaround
branch
from
September 9, 2026 17:26
000ecc4 to
e9fa78f
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
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.
Consolidated ShiftStack-side adoption CI fixes for OSPRH-34580, kept as one commit and one PR.
Why
The adoption TP can consume only one
cifmw_shiftstack_qa_change_ref, and validation found two small additional ShiftStack-side blockers after the original PR #30 scope. This PR now carries the complete minimal ShiftStack diff needed by the TP; PR #37 and PR #39 are superseded by this branch.Changes
adoption.yamland the IPI install-config template.jobs_definitions/adoption.yamllimited tocleanup,prepare,install,post, andverification.openstack_testonly injobs_definitions/adoption_verification.yaml, after adoption, as a separate post-adoption stage.openstack_testwhenhypervisoris not defined; the test stage itself still runs./home/zuul/pull-secret.jsonis already pre-populated, and preserve pre-populated files during cleanup.namespace.imagetonamespace/imageforjq contains().openstack catalog show manila -f jsonreturns an empty JSON object.Validation
Local checks:
git diff --checkpassed.yamllintpassed on changed YAML files.{}, empty stdout, rc=1 skip; non-empty JSON runs).whenterms after an earlier false term.Full local
pre-commit run --files ...could not complete on this workstation becauseansible-lintsyntax-checks repo playbooks that load encryptedconfigs/secret.yamland no vault secret is available locally. GitHub CI should provide the authoritative ansible-lint result.Keep draft until TP validation is green.