Sitelet https://github.com/openstack-k8s-operators/s2i-openstack-containers/pull/233
Skip to content

Support overriding upper-constraints and restore following upper-constraints in tempest - #233

Open
amoralej wants to merge 2 commits into
openstack-k8s-operators:mainfrom
amoralej:tempest-uc
Open

amoralej wants to merge 2 commits into
openstack-k8s-operators:mainfrom
amoralej:tempest-uc

Conversation

@amoralej

Copy link
Copy Markdown
Contributor

This PR includes two patches:

  • build.sh supports overriding specific packages versions in upper-constraints.txt by pinning them to specific versions in pythondeps.txt or pythonbuilddeps.txt.
  • Restore upper-constraints to tempest so that we start getting automatic updates from update-sources while we keep pinning gabbi because of known build issue in 4.2.0.

@openshift-ci

openshift-ci Bot commented Sep 24, 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 amoralej 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

@centosinfra-prod-github-app

Copy link
Copy Markdown

@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/ab2b38af829246d38f5f16bf018ecfc4

✔️ s2i-openstack-containers-molecule SUCCESS in 2m 05s
✔️ s2i-openstack-container-content-provider SUCCESS in 4h 54m 31s
✔️ s2i-openstack-container-consumer-smoke SUCCESS in 6m 19s
❌ s2i-openstack-deploy-validation POST_FAILURE in 22m 32s

amoralej and others added 2 commits October 6, 2026 09:42
…ints

Packages pinned with == in pythondeps.txt or pythonbuilddeps.txt now take
priority over upper-constraints.txt during pip-compile lockfile generation.
The pinned package is removed from the constraints file before pip-compile
runs (update-sources, sync-locks) and also stripped from the old lockfile
input (update-lockfiles), so the locally-specified version wins in all three
flows.

Adds collect_pinned_python_packages and apply_constraints_overrides helpers
in build.sh reused by both generate_requirements_lock and
regenerate_requirements_lock. Tests and docs updated.

Assisted-By: Claude
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This patch is restoring upper-constraints to the sources.txt in tempest
so that update-sources keeps updating it with upstream content while
keeping the gabbi pinned to the known good version 4.1.1.

It also includes a update-sources needed as part of the restoration.

Signed-off-by: Alfredo Moralejo <amoralej@redhat.com>
@centosinfra-prod-github-app

Copy link
Copy Markdown

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant