Skip to content

[devscripts] Make repository revision overrideable - #4106

Draft
imatza-rh wants to merge 1 commit into
openstack-k8s-operators:mainfrom
shiftstack:devscripts-pin-to-defaults
Draft

[devscripts] Make repository revision overrideable#4106
imatza-rh wants to merge 1 commit into
openstack-k8s-operators:mainfrom
shiftstack:devscripts-pin-to-defaults

Conversation

@imatza-rh

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

Copy link
Copy Markdown
Contributor

Summary

  • Move cifmw_devscripts_repo and cifmw_devscripts_repo_branch from
    role vars to role defaults so normal Ansible inventory, play, and group
    variables can override them.
  • Keep the current CI-validated revision
    9116d288bb2885a29d3c9c9c4bf422305bef370d as the default.
  • Document both variables and verify an exact revision override in Molecule.

Why this changed from HEAD

The original revision made every consumer follow a floating upstream tip.
That solved the immediate RHEL 10 blocker but also exposed RHOSO 18 and
adoption jobs to unrelated upstream changes without equivalent validation.

RHOSO 19 jobs instead use the immutable revision
f93ad777ba3fd43b77c27bbc1b70362d31cb582c. That revision contains the
required rhel10|centos10 install path. Keeping the older role default makes
this change opt-in and reproducible.

Compatibility

Consumer Effective revision
Existing RHOSO 18 and adoption jobs Unchanged default 9116d288...
RHOSO 19 Uni01 and Uni03 jobs Explicit f93ad777... override
Other role callers Unchanged unless they explicitly override the default

No existing ci-framework-jobs main-branch job overrides this variable.
Moving the value does not change the default; it only makes intentional
lower-precedence overrides effective.

Validation

  • Repository pre-commit hooks pass on a worktree based on current main,
    including Ansible syntax and lint checks.
  • Focused checkout test passes for old pin to new pin transition, exact
    revision resolution, repeat-run idempotency, and the expected failure for
    nonexistent branch main.
  • Promotion candidate resolution reads the new defaults path and resolves the
    live upstream tip; its replacement expression was exercised independently.
  • RHOSO 19 Uni01 build
    f2cd6afe
    and Uni03 build
    eb556d55
    ran while f93ad777... was upstream tip, completed dev-scripts
    make all, and failed later in unrelated deployment/post-deployment work.
  • Earlier Uni03 build
    96700fb3
    completed successfully with 3,094 passed, 448 skipped, and zero failed or
    errored reported tests using an earlier RHEL 10-capable upstream revision.

The updated Molecule assertion still needs to run in Linux CI. Local Podman on
macOS cannot run the scenario because nested virtualization is unavailable.

Related-Issue: #OSPNW-1694

AI assistance: OpenAI Codex assisted with compatibility analysis, test design,
and wording. The author reviewed the resulting changes.

@openshift-ci

openshift-ci Bot commented Aug 13, 2026

Copy link
Copy Markdown
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci

openshift-ci Bot commented Aug 13, 2026

Copy link
Copy Markdown
Contributor

[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 tosky 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

@dsariel
dsariel requested a review from rebtoor August 13, 2026 14:13
Comment thread roles/devscripts/defaults/main.yml Outdated
@centosinfra-prod-github-app

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/bb67b20108d344cfbde607243aad26e6

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 38m 18s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 41m 07s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 58m 07s
✔️ cifmw-pod-zuul-files SUCCESS in 4m 54s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 57s
✔️ cifmw-pod-pre-commit SUCCESS in 8m 45s
cifmw-molecule-devscripts FAILURE in 10m 11s

@imatza-rh
imatza-rh force-pushed the devscripts-pin-to-defaults branch 2 times, most recently from 811aab3 to 0f21185 Compare August 14, 2026 11:41
@imatza-rh imatza-rh changed the title [devscripts] Remove pin, track upstream main branch [devscripts] Remove pin, track upstream default branch Aug 14, 2026
@centosinfra-prod-github-app

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/4fa042ae29e84055aa804a8a4bb26c6c

openstack-k8s-operators-content-provider FAILURE in 7m 23s
⚠️ podified-multinode-edpm-deployment-crc SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
⚠️ cifmw-crc-podified-edpm-baremetal SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
✔️ cifmw-pod-zuul-files SUCCESS in 4m 29s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 22s
✔️ cifmw-pod-pre-commit SUCCESS in 8m 23s
✔️ cifmw-molecule-devscripts SUCCESS in 10m 14s

@davidsaOpenu

Copy link
Copy Markdown

recheck

@github-actions

github-actions Bot commented Sep 2, 2026

Copy link
Copy Markdown

This PR is stale because it has been for over 15 days with no activity.
Remove stale label or comment or this will be closed in 7 days.

@github-actions github-actions Bot added the Stale label Sep 2, 2026
@github-actions github-actions Bot closed this Sep 10, 2026
@imatza-rh imatza-rh reopened this Sep 10, 2026
@centosinfra-prod-github-app

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/67276aa2ac644e7c97895659d2a31d4a

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 52m 45s
podified-multinode-edpm-deployment-crc FAILURE in 19m 36s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 29m 56s
✔️ cifmw-pod-zuul-files SUCCESS in 4m 32s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 32s
✔️ cifmw-pod-pre-commit SUCCESS in 8m 57s
✔️ cifmw-molecule-devscripts SUCCESS in 10m 31s

@imatza-rh imatza-rh changed the title [devscripts] Remove pin, track upstream default branch [devscripts] Make repository revision overrideable Sep 10, 2026
Move the dev-scripts repository URL and revision from role vars to role
defaults so callers can select a tested revision through normal Ansible
precedence.

Keep 9116d288bb2885a29d3c9c9c4bf422305bef370d as the default to
preserve existing RHOSO 18 and adoption behavior. Document the variables
and exercise an exact RHOSO 19-tested override in Molecule.

Related-Issue: #OSPNW-1694
Assisted-By: OpenAI Codex
Signed-off-by: Itay Matza <imatza@redhat.com>
@imatza-rh
imatza-rh force-pushed the devscripts-pin-to-defaults branch from 0f21185 to c959612 Compare September 10, 2026 14:31
@centosinfra-prod-github-app

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/0e700491361d46adbb6e13a3219e64bf

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 53m 35s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 23m 10s
cifmw-crc-podified-edpm-baremetal NODE_FAILURE Node(set) request 099-0000199329 failed in 0s
✔️ cifmw-pod-zuul-files SUCCESS in 4m 40s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 25s
✔️ cifmw-pod-pre-commit SUCCESS in 8m 15s
✔️ cifmw-molecule-devscripts SUCCESS in 10m 32s

@github-actions github-actions Bot removed the Stale label Sep 11, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants