Skip to content

chore: update stage2-prod mock config - #18330

Open
reubeno wants to merge 1 commit into
microsoft:4.0from
reubeno:update-prod-distro-mock-config
Open

chore: update stage2-prod mock config#18330
reubeno wants to merge 1 commit into
microsoft:4.0from
reubeno:update-prod-distro-mock-config

Conversation

@reubeno

@reubeno reubeno commented Aug 5, 2026

Copy link
Copy Markdown
Member

Now that PROD is building stage2 against stage2, we need to remove the stage1 compat package from the buildroot.

We also remove some forcibly-set macros to be more consistent with koji configuration in PROD; this enables us to reproduce some package build failures that show up without these set.

Validation

Tested with local package building via: azldev comp build --config-file distro/stage2-prod.toml and multiple packages.

Now that PROD is building stage2 against stage2, we need to remove
the stage1 compat package from the buildroot.

We also remove some forcibly-set macros to be more consistent with
koji configuration in PROD; this enables us to reproduce some package
build failures that show up without these set.
@reubeno
reubeno requested a review from a team as a code owner August 5, 2026 19:30
Copilot AI balanced review requested due to automatic review settings August 5, 2026 19:30

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Updates the production Stage 2 mock buildroot to match current Koji behavior.

Changes:

  • Removes the obsolete Stage 1 compatibility package.
  • Stops forcibly defining RPM distribution macros.

@tobiasb-ms

Copy link
Copy Markdown
Contributor

question(blocking): What validation has been done on this? For example, have we validated that even without config_opts['macros']['%dist'] = '.azl4', things still end up with .azl4?

@reubeno

reubeno commented Aug 5, 2026

Copy link
Copy Markdown
Member Author

question(blocking): What validation has been done on this? For example, have we validated that even without config_opts['macros']['%dist'] = '.azl4', things still end up with .azl4?

@tobiasb-ms Good question; I've updated the PR description to reflect this, but the short version is that I used it with local azldev builds and several packages.

As for the other part of your question -- and this is the most interesting bit -- the whole point of that part of the change is to match what's happening in PROD koji, in which we've also removed the setting. And we have 3 packages where we don't end up with .azl4 -- and they're real problems we're working through. With this change we can now faithfully reproduce those failures locally.

(For those curious about those cases -- they're packages where upstream Fedora has force-enabled bootstrap and ended up with a .azl4~bootstrap in the dist tag. We're now seeing the same behavior that upstream does for them.)

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.

3 participants