Skip to content

Commit

Permalink
Merge pull request #371 from Luap99/ebpf
Browse files Browse the repository at this point in the history
add bpftrace for CI debugging
  • Loading branch information
edsantiago authored Aug 6, 2024
2 parents 798e83d + 13b68fe commit 83c9b16
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 3 deletions.
2 changes: 1 addition & 1 deletion IMG_SFX
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20240708t152000z-f40f39d13
20240805t173227z-f40f39d13
2 changes: 1 addition & 1 deletion base_images/debian_base-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ source "$REPO_DIRPATH/lib.sh"
# https://bugzilla.redhat.com/show_bug.cgi?id=2230127
# 2024-01-25 dfsg-3 also has the bug
# 2024-05-01 trixy still has 1.35+dfsg-3
timebomb 20240801 "prevent us from getting broken tar-1.35+dfsg-3"
timebomb 20240901 "prevent us from getting broken tar-1.35+dfsg-3"
$SUDO tee /etc/apt/preferences.d/$(date +%Y%m%d)-tar <<EOF
Package: tar
Pin: version 1.35+dfsg-[23]
Expand Down
9 changes: 9 additions & 0 deletions cache_images/debian_packaging.sh
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,15 @@ INSTALL_PACKAGES=(\
zstd
)

# bpftrace is only needed on the host as containers cannot run ebpf
# programs anyway and it is very big so we should not bloat the container
# images unnecessarily.
if ! ((CONTAINER)); then
INSTALL_PACKAGES+=( \
bpftrace
)
fi

msg "Installing general build/testing dependencies"
bigto $SUDO apt-get -q -y install "${INSTALL_PACKAGES[@]}"

Expand Down
6 changes: 5 additions & 1 deletion cache_images/fedora_packaging.sh
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,12 @@ fi

# When installing during a container-build, having this present
# will seriously screw up future dnf operations in very non-obvious ways.
# bpftrace is only needed on the host as containers cannot run ebpf
# programs anyway and it is very big so we should not bloat the container
# images unnecessarily.
if ! ((CONTAINER)); then
INSTALL_PACKAGES+=( \
bpftrace
container-selinux
libguestfs-tools
selinux-policy-devel
Expand Down Expand Up @@ -213,6 +217,6 @@ lilto $SUDO dnf update -y
# which causes rootless podman pods to fail.
# https://github.com/containers/podman/issues/18543
if ! ((CONTAINER)); then
timebomb 20240710 "Temporary workaround for signed rpms (ima) in rawhide"
timebomb 20240901 "Temporary workaround for signed rpms (ima) in rawhide"
$SUDO setfattr -x security.ima /usr/libexec/catatonit/catatonit || true
fi

0 comments on commit 83c9b16

Please sign in to comment.