ENT-13766: Various fixes / improvements to buildhost provisioning#2130
Merged
larsewi merged 4 commits intocfengine:masterfrom Mar 5, 2026
Merged
ENT-13766: Various fixes / improvements to buildhost provisioning#2130larsewi merged 4 commits intocfengine:masterfrom
larsewi merged 4 commits intocfengine:masterfrom
Conversation
Contributor
larsewi
commented
Mar 4, 2026
larsewi
commented
- Reduce provisioning noise in setup-cfengine-build-host.sh
- Fix pipx uninstall error: pipx does not accept -y flag
- Broaden have_i386_architecture class from ubuntu_16 to ubuntu
- Fix wine:i386 package install ordering on mingw build hosts
Remove set -x to avoid printing every command during provisioning. Add -q to grep calls used only for control flow and redirect command -v / ls output to /dev/null to suppress confusing messages from conditional checks. Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech> Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
pipx uninstall does not support the -y flag (only pip does). Conditionally use -y only when PIP is pip/pip3. Ticket: ENT-13766 Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech> Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
The class was restricted to ubuntu_16 but is needed by any Ubuntu mingw build host to check if i386 architecture is already added. Ticket: ENT-13766 Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech> Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
CFEngine evaluates packages before commands within a bundle. This caused wine:i386 to fail because i386 architecture was not yet added (dpkg --add-architecture runs in the commands section). The failure cascaded to all other packages in the batch. Guard wine:i386 with have_i386_architecture class so it is skipped on the first cf-agent run. Add apt-get update (via depends_on) after adding the architecture so the i386 package lists are available for the second run. Ticket: ENT-13766 Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech> Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
craigcomstock
approved these changes
Mar 4, 2026
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
2 participants
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.