Skip to content

Consolidate shiftstack adoption CI fixes - #30

Draft
imatza-rh wants to merge 1 commit into
mainfrom
remove-ocpbugs-67159-workaround
Draft

Consolidate shiftstack adoption CI fixes#30
imatza-rh wants to merge 1 commit into
mainfrom
remove-ocpbugs-67159-workaround

Conversation

@imatza-rh

@imatza-rh imatza-rh commented Aug 5, 2026

Copy link
Copy Markdown
Contributor

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

  • Remove the OCPBUGS-67159 fixed VIP workaround from adoption.yaml and the IPI install-config template.
  • Keep pre-adoption jobs_definitions/adoption.yaml limited to cleanup, prepare, install, post, and verification.
  • Run openstack_test only in jobs_definitions/adoption_verification.yaml, after adoption, as a separate post-adoption stage.
  • Skip only the hypervisor DNS add/restore tasks in openstack_test when hypervisor is not defined; the test stage itself still runs.
  • Skip pull-secret extraction when /home/zuul/pull-secret.json is already pre-populated, and preserve pre-populated files during cleanup.
  • Fix Swift registry object matching from namespace.image to namespace/image for jq contains().
  • Skip Manila checks when openstack catalog show manila -f json returns an empty JSON object.

Validation

Local checks:

  • git diff --check passed.
  • yamllint passed on changed YAML files.
  • Focused Ansible probe passed for the Manila guard ({}, empty stdout, rc=1 skip; non-empty JSON runs).
  • Focused Ansible probe confirmed Ansible 2.19 skips later when terms after an earlier false term.

Full local pre-commit run --files ... could not complete on this workstation because ansible-lint syntax-checks repo playbooks that load encrypted configs/secret.yaml and no vault secret is available locally. GitHub CI should provide the authoritative ansible-lint result.

Keep draft until TP validation is green.

@openshift-ci

openshift-ci Bot commented Aug 5, 2026

Copy link
Copy Markdown

[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 assign dlaw4608 for approval. 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

@imatza-rh
imatza-rh force-pushed the remove-ocpbugs-67159-workaround branch from a3a26e1 to 8eadd43 Compare August 5, 2026 10:20
@imatza-rh imatza-rh changed the title Remove OCPBUGS-67159 workaround Remove OCPBUGS-67159 workaround and enable openstack_test Aug 5, 2026
@imatza-rh
imatza-rh force-pushed the remove-ocpbugs-67159-workaround branch from 8eadd43 to d0ba31d Compare August 5, 2026 18:15
@imatza-rh
imatza-rh force-pushed the remove-ocpbugs-67159-workaround branch from 3acf99e to 856950f Compare August 26, 2026 12:55
@imatza-rh
imatza-rh force-pushed the remove-ocpbugs-67159-workaround branch from 10c344d to 000ecc4 Compare September 9, 2026 09:27
@imatza-rh imatza-rh changed the title Remove OCPBUGS-67159 workaround and enable openstack_test Consolidate shiftstack adoption CI fixes Sep 9, 2026
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
imatza-rh force-pushed the remove-ocpbugs-67159-workaround branch from 000ecc4 to e9fa78f Compare September 9, 2026 17:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

1 participant