diff options
| author | fanquake <fanquake@gmail.com> | 2023-04-21 15:23:08 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-05-02 12:02:45 +0100 |
| commit | f952e679cd9c642e2c1f484ad8d75510ce25324c (patch) | |
| tree | 4fc361ca88c1edb44eca75cb58b74324f40aa2a8 /ci | |
| parent | 1232c2f6b9c8c6c8c2bb249cf8368cebd77fb63d (diff) | |
| download | bitcoin-f952e679cd9c642e2c1f484ad8d75510ce25324c.tar.xz | |
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.
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/test/00_setup_env_native_asan.sh | 5 | ||||
| -rwxr-xr-x | ci/test/01_base_install.sh | 8 |
2 files changed, 0 insertions, 13 deletions
diff --git a/ci/test/00_setup_env_native_asan.sh b/ci/test/00_setup_env_native_asan.sh index b251a77b7e..8701d383dd 100755 --- a/ci/test/00_setup_env_native_asan.sh +++ b/ci/test/00_setup_env_native_asan.sh @@ -8,13 +8,8 @@ export LC_ALL=C.UTF-8 # Only install BCC tracing packages in Cirrus CI. 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" else - export ADD_UNTRUSTED_BPFCC_PPA=false export BPFCC_PACKAGE="" fi diff --git a/ci/test/01_base_install.sh b/ci/test/01_base_install.sh index d7ff80d972..641ff964f3 100755 --- a/ci/test/01_base_install.sh +++ b/ci/test/01_base_install.sh @@ -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 --allowerasing install $CI_BASE_PACKAGES $PACKAGES" 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 echo "${APPEND_APT_SOURCES_LIST}" >> /etc/apt/sources.list fi |