Skip to content

Commit f952e67

Browse files
committed
ci: remove usage of untrusted bpfcc-tools
We've migrated this job to Ubuntu 23.04, which ships with newer versions of the tools: https://packages.ubuntu.com/lunar/bpfcc-tools.
1 parent 1232c2f commit f952e67

File tree

2 files changed

+0
-13
lines changed

2 files changed

+0
-13
lines changed

ci/test/00_setup_env_native_asan.sh

-5
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,8 @@ export LC_ALL=C.UTF-8
88

99
# Only install BCC tracing packages in Cirrus CI.
1010
if [[ "${CIRRUS_CI}" == "true" ]]; then
11-
# We install an up-to-date 'bpfcc-tools' package from an untrusted PPA.
12-
# This can be dropped with the next Ubuntu or Debian release that includes up-to-date packages.
13-
# See the if-then in ci/test/04_install.sh too.
14-
export ADD_UNTRUSTED_BPFCC_PPA=true
1511
export BPFCC_PACKAGE="bpfcc-tools"
1612
else
17-
export ADD_UNTRUSTED_BPFCC_PPA=false
1813
export BPFCC_PACKAGE=""
1914
fi
2015

ci/test/01_base_install.sh

-8
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,6 @@ if [[ $CI_IMAGE_NAME_TAG == *centos* ]]; then
2121
${CI_RETRY_EXE} bash -c "dnf -y install epel-release"
2222
${CI_RETRY_EXE} bash -c "dnf -y --allowerasing install $CI_BASE_PACKAGES $PACKAGES"
2323
elif [ "$CI_USE_APT_INSTALL" != "no" ]; then
24-
if [[ "${ADD_UNTRUSTED_BPFCC_PPA}" == "true" ]]; then
25-
# Ubuntu 22.04 LTS and Debian 11 both have an outdated bpfcc-tools packages.
26-
# The iovisor PPA is outdated as well. The next Ubuntu and Debian releases will contain updated
27-
# packages. Meanwhile, use an untrusted PPA to install an up-to-date version of the bpfcc-tools
28-
# package.
29-
# TODO: drop this once we can use newer images in GCE
30-
add-apt-repository ppa:hadret/bpfcc
31-
fi
3224
if [[ -n "${APPEND_APT_SOURCES_LIST}" ]]; then
3325
echo "${APPEND_APT_SOURCES_LIST}" >> /etc/apt/sources.list
3426
fi

0 commit comments

Comments
 (0)