Skip to content

Commit 0ae92fe

Browse files
larsewiclaude
andcommitted
Fix wine:i386 package install ordering on mingw build hosts
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>
1 parent 9e93cbc commit 0ae92fe

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

ci/cfengine-build-host-setup.cf

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,9 @@ bundle agent cfengine_build_host_setup
6767

6868

6969
mingw_build_host::
70-
"wine:i386";
7170
"mingw-w64";
71+
mingw_build_host.have_i386_architecture::
72+
"wine:i386";
7273
(debian_10|debian_11).systemssl_build_host::
7374
"libssl-dev";
7475
debian.bootstrap_pr_host::
@@ -320,7 +321,11 @@ jenkins_builds ALL=NOPASSWD: /usr/bin/podman
320321
"yum install -y python3-pip" contain => in_shell;
321322

322323
mingw_build_host.!have_i386_architecture::
323-
"${paths.dpkg} --add-architecture i386";
324+
"${paths.dpkg} --add-architecture i386"
325+
handle => "i386_arch_added";
326+
"DEBIAN_FRONTEND=noninteractive apt-get update"
327+
depends_on => { "i386_arch_added" },
328+
contain => in_shell;
324329

325330
ubuntu.not_in_container.localhost_localdomain_hostname_missing::
326331
"/usr/bin/hostnamectl set-hostname localhost.localdomain"

0 commit comments

Comments
 (0)