{ComponentFix} Combine update + install into a single transaction#33442
Open
msarfraz wants to merge 4 commits into
Open
{ComponentFix} Combine update + install into a single transaction#33442msarfraz wants to merge 4 commits into
msarfraz wants to merge 4 commits into
Conversation
…t repo-sync skew failures
msarfraz
requested review from
YanaXu,
bebound,
jiasli,
naga-nandyala,
wangzelin007 and
yonzhan
as code owners
️✔️AzureCLI-FullTest
|
️✔️AzureCLI-BreakingChangeTest
|
Collaborator
|
Thank you for your contribution! We will review the pull request and get back to you soon. |
|
The git hooks are available for azure-cli and azure-cli-extensions repos. They could help you run required checks before creating the PR. Please sync the latest code with latest dev branch (for azure-cli) or main branch (for azure-cli-extensions). pip install azdev --upgrade
azdev setup -c <your azure-cli repo path> -r <your azure-cli-extensions repo path>
|
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the RPM build Dockerfiles to reduce transient build failures caused by temporary repo-sync skew by running the package update and build-dependency installation together in the same Docker build step.
Changes:
- Combine
update+installinto a singleRUNinstruction for UBI (yum) and Fedora (dnf). - Add inline comments explaining the repo-sync skew failure mode being mitigated.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| scripts/release/rpm/ubi.dockerfile | Combines yum update + yum install into one Docker layer with added rationale comment. |
| scripts/release/rpm/fedora.dockerfile | Combines dnf update + dnf install into one Docker layer with added rationale comment. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+10
to
+13
| # Combine update + install into a single transaction so dnf resolves a | ||
| # consistent set of packages. Running them separately can fail when the | ||
| # BaseOS and AppStream repos are temporarily out of sync (e.g. AppStream | ||
| # ships glibc-devel-X but BaseOS hasn't published the matching glibc-X yet). |
Comment on lines
+9
to
+10
| RUN dnf update -y && \ | ||
| dnf install -y wget rpm-build gcc libffi-devel ${python_package}-devel openssl-devel make bash coreutils diffutils patch dos2unix perl |
Comment on lines
+10
to
+16
| # Install build dependencies in a single dnf transaction so the resolver | ||
| # picks a mutually consistent set of packages. A separate `yum update -y` | ||
| # step is intentionally avoided: when BaseOS and AppStream are temporarily | ||
| # out of sync (e.g. AppStream ships glibc-devel-X but BaseOS has not yet | ||
| # published the matching glibc-X), updating first pins glibc to a version | ||
| # that no installable glibc-devel matches, which then breaks `gcc` install. | ||
| # The base UBI image already ships with security updates; `dnf install` |
Comment on lines
+11
to
+17
| # picks a mutually consistent set of packages. A separate `yum update -y` | ||
| # step is intentionally avoided: when BaseOS and AppStream are temporarily | ||
| # out of sync (e.g. AppStream ships glibc-devel-X but BaseOS has not yet | ||
| # published the matching glibc-X), updating first pins glibc to a version | ||
| # that no installable glibc-devel matches, which then breaks `gcc` install. | ||
| # The base UBI image already ships with security updates; `dnf install` | ||
| # will pull any newer transitive dependencies it needs. |
Comment on lines
+9
to
+11
| # step is intentionally avoided: when BaseOS and AppStream are temporarily | ||
| # out of sync, updating first can pin glibc to a version whose matching | ||
| # glibc-devel is not yet available, breaking the subsequent install. |
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.
…t repo-sync skew failures
Related command
Description
Combine update + install into a single transaction so dnf resolves a consistent set of packages and avoids transient repo-sync skew failures.
Testing Guide
History Notes
[Component Name 1] BREAKING CHANGE:
az command a: Make some customer-facing breaking change[Component Name 2]
az command b: Add some customer-facing featureThis checklist is used to make sure that common guidelines for a pull request are followed.
The PR title and description has followed the guideline in Submitting Pull Requests.
I adhere to the Command Guidelines.
I adhere to the Error Handling Guidelines.