mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-03-05 14:06:27 -05:00
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.
This commit is contained in:
parent
1232c2f6b9
commit
f952e679cd
2 changed files with 0 additions and 13 deletions
|
@ -8,13 +8,8 @@ export LC_ALL=C.UTF-8
|
||||||
|
|
||||||
# Only install BCC tracing packages in Cirrus CI.
|
# Only install BCC tracing packages in Cirrus CI.
|
||||||
if [[ "${CIRRUS_CI}" == "true" ]]; then
|
if [[ "${CIRRUS_CI}" == "true" ]]; then
|
||||||
# We install an up-to-date 'bpfcc-tools' package from an untrusted PPA.
|
|
||||||
# This can be dropped with the next Ubuntu or Debian release that includes up-to-date packages.
|
|
||||||
# See the if-then in ci/test/04_install.sh too.
|
|
||||||
export ADD_UNTRUSTED_BPFCC_PPA=true
|
|
||||||
export BPFCC_PACKAGE="bpfcc-tools"
|
export BPFCC_PACKAGE="bpfcc-tools"
|
||||||
else
|
else
|
||||||
export ADD_UNTRUSTED_BPFCC_PPA=false
|
|
||||||
export BPFCC_PACKAGE=""
|
export BPFCC_PACKAGE=""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -21,14 +21,6 @@ if [[ $CI_IMAGE_NAME_TAG == *centos* ]]; then
|
||||||
${CI_RETRY_EXE} bash -c "dnf -y install epel-release"
|
${CI_RETRY_EXE} bash -c "dnf -y install epel-release"
|
||||||
${CI_RETRY_EXE} bash -c "dnf -y --allowerasing install $CI_BASE_PACKAGES $PACKAGES"
|
${CI_RETRY_EXE} bash -c "dnf -y --allowerasing install $CI_BASE_PACKAGES $PACKAGES"
|
||||||
elif [ "$CI_USE_APT_INSTALL" != "no" ]; then
|
elif [ "$CI_USE_APT_INSTALL" != "no" ]; then
|
||||||
if [[ "${ADD_UNTRUSTED_BPFCC_PPA}" == "true" ]]; then
|
|
||||||
# Ubuntu 22.04 LTS and Debian 11 both have an outdated bpfcc-tools packages.
|
|
||||||
# The iovisor PPA is outdated as well. The next Ubuntu and Debian releases will contain updated
|
|
||||||
# packages. Meanwhile, use an untrusted PPA to install an up-to-date version of the bpfcc-tools
|
|
||||||
# package.
|
|
||||||
# TODO: drop this once we can use newer images in GCE
|
|
||||||
add-apt-repository ppa:hadret/bpfcc
|
|
||||||
fi
|
|
||||||
if [[ -n "${APPEND_APT_SOURCES_LIST}" ]]; then
|
if [[ -n "${APPEND_APT_SOURCES_LIST}" ]]; then
|
||||||
echo "${APPEND_APT_SOURCES_LIST}" >> /etc/apt/sources.list
|
echo "${APPEND_APT_SOURCES_LIST}" >> /etc/apt/sources.list
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Add table
Reference in a new issue