Skip to content

Commit 33d2f08

Browse files
authored
Include binutils in distro images to avoid network flakiness (#1502)
* Include binutils in distro images to avoid network flakiness
1 parent ae6878e commit 33d2f08

File tree

8 files changed

+7
-12
lines changed

8 files changed

+7
-12
lines changed

.github/workflows/distros.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
- 'dev/distros/**'
77
branches:
88
- main
9+
workflow_dispatch: {}
910

1011
concurrency:
1112
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

dev/distros/dockerfiles/almalinux-8.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ RUN dnf install -y \
1111
ca-certificates \
1212
bash \
1313
coreutils \
14+
binutils \
1415
curl \
1516
procps-ng \
1617
ipvsadm \

dev/distros/dockerfiles/centos-9.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ RUN dnf install -y \
1111
ca-certificates \
1212
bash \
1313
coreutils \
14+
binutils \
1415
curl \
1516
procps-ng \
1617
ipvsadm \

dev/distros/dockerfiles/debian-bookworm.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ RUN apt-get update && apt-get install -y \
88
ca-certificates \
99
bash \
1010
coreutils \
11+
binutils \
1112
curl \
1213
inotify-tools \
1314
ipvsadm \

dev/distros/dockerfiles/debian-bullseye.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ RUN apt-get update && apt-get install -y \
88
ca-certificates \
99
bash \
1010
coreutils \
11+
binutils \
1112
curl \
1213
inotify-tools \
1314
ipvsadm \

dev/distros/dockerfiles/ubuntu-jammy.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ RUN apt-get update && apt-get install -y \
88
ca-certificates \
99
bash \
1010
coreutils \
11+
binutils \
1112
curl \
1213
inotify-tools \
1314
ipvsadm \

e2e/install_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ func TestHostPreflightCustomSpec(t *testing.T) {
291291
defer tc.Cleanup()
292292

293293
t.Logf("%s: installing test dependencies on node 0", time.Now().Format(time.RFC3339))
294-
line := []string{"yum", "install", "-y", "binutils", "fio"}
294+
line := []string{"yum", "install", "-y", "fio"}
295295
if stdout, stderr, err := tc.RunCommandOnNode(0, line); err != nil {
296296
t.Fatalf("fail to install dependencies on node 0: %v: %s: %s", err, stdout, stderr)
297297
}

e2e/unsupported-overrides_test.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,6 @@ func TestUnsupportedOverrides(t *testing.T) {
2020
})
2121
defer tc.Cleanup()
2222

23-
t.Logf("%s: installing dependencies on node 0", time.Now().Format(time.RFC3339))
24-
commands := [][]string{
25-
{"apt-get", "update", "-y"},
26-
{"apt-get", "install", "binutils", "-y"},
27-
}
28-
for _, cmd := range commands {
29-
if stdout, stderr, err := tc.RunCommandOnNode(0, cmd); err != nil {
30-
t.Fatalf("fail to run command %q: %v: %s: %s", cmd, err, stdout, stderr)
31-
}
32-
}
33-
3423
t.Logf("%s: installing embedded-cluster with unsupported overrides on node 0", time.Now().Format(time.RFC3339))
3524
line := []string{"unsupported-overrides.sh"}
3625
if stdout, stderr, err := tc.RunCommandOnNode(0, line); err != nil {

0 commit comments

Comments
 (0)