From 9b098b30d1fea867fafd795fc39e458bc7d35806 Mon Sep 17 00:00:00 2001 From: "Maciej \"Iwan\" Iwanowski" Date: Sat, 15 Jun 2024 18:39:01 +0200 Subject: [PATCH 1/4] Using bookworm images --- build/integration-in-docker.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/build/integration-in-docker.sh b/build/integration-in-docker.sh index 662c58a766..a7227f947d 100755 --- a/build/integration-in-docker.sh +++ b/build/integration-in-docker.sh @@ -42,7 +42,7 @@ function run_tests() { docker run --rm \ -w /go/src/github.com/google/cadvisor \ -v ${PWD}:/go/src/github.com/google/cadvisor \ - golang:"$GOLANG_VERSION-bullseye" \ + golang:"$GOLANG_VERSION-bookworm" \ bash -c "$BUILD_CMD" EXTRA_DOCKER_OPTS="-e DOCKER_IN_DOCKER_ENABLED=true" @@ -58,13 +58,11 @@ function run_tests() { --privileged \ --cap-add="sys_admin" \ --entrypoint="" \ - gcr.io/k8s-testimages/bootstrap \ + gcr.io/k8s-staging-test-infra/bootstrap \ bash -c "export DEBIAN_FRONTEND=noninteractive && \ - echo 'deb http://deb.debian.org/debian buster-backports main'>/etc/apt/sources.list.d/buster.list && \ - cat /etc/apt/sources.list.d/buster.list && \ apt update && \ - apt install -y -t buster-backports $PACKAGES && \ - CADVISOR_ARGS="$CADVISOR_ARGS" /usr/local/bin/runner.sh build/integration.sh" + apt install -y $PACKAGES && \ + CADVISOR_ARGS=$CADVISOR_ARGS /usr/local/bin/runner.sh build/integration.sh" } GO_FLAGS=${GO_FLAGS:-"-tags=netgo -race"} From 54675d703d12ffbeefaea396ff32668ea33da5b7 Mon Sep 17 00:00:00 2001 From: "Maciej \"Iwan\" Iwanowski" Date: Sat, 15 Jun 2024 18:46:08 +0200 Subject: [PATCH 2/4] libipmctl4 -> libipmctl5 --- build/config/libipmctl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/config/libipmctl.sh b/build/config/libipmctl.sh index c0b4cc31ed..f4cfe32868 100644 --- a/build/config/libipmctl.sh +++ b/build/config/libipmctl.sh @@ -13,6 +13,6 @@ # limitations under the License. export GO_FLAGS="-tags=libipmctl,cgo -race" -export PACKAGES="sudo libipmctl4" -export BUILD_PACKAGES="libipmctl4 libipmctl-dev" +export PACKAGES="sudo libipmctl5" +export BUILD_PACKAGES="libipmctl5 libipmctl-dev" export CADVISOR_ARGS="-perf_events_config=perf/testing/perf-non-hardware.json" From cc13fa875cabc9492b20911efbcc137683857a82 Mon Sep 17 00:00:00 2001 From: "Maciej \"Iwan\" Iwanowski" Date: Sat, 15 Jun 2024 19:01:09 +0200 Subject: [PATCH 3/4] Using Ubuntu 22.04 (bookworm-based) to run unit tests --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 997b94f2e9..b79d46da8f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,7 +5,7 @@ jobs: strategy: matrix: go-versions: ['1.22', '1.21'] - platform: [ubuntu-20.04] + platform: [ubuntu-22.04] environment-variables: [build/config/plain.sh, build/config/libpfm4.sh, build/config/libipmctl.sh] runs-on: ${{ matrix.platform }} timeout-minutes: 30 @@ -32,7 +32,7 @@ jobs: strategy: matrix: go-versions: ['1.22', '1.21'] - platform: [ubuntu-20.04] + platform: [ubuntu-22.04] environment-variables: [build/config/plain.sh, build/config/libpfm4.sh, build/config/libipmctl.sh] runs-on: ${{ matrix.platform }} timeout-minutes: 30 From 745b20ae71fa24df28799a02cbd017dbefc13af7 Mon Sep 17 00:00:00 2001 From: zhangguanzhang Date: Wed, 3 Jul 2024 22:18:15 +0800 Subject: [PATCH 4/4] CI: update busybox image to fix CI --- integration/framework/framework.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration/framework/framework.go b/integration/framework/framework.go index 864f430bd3..8303c6bb9a 100644 --- a/integration/framework/framework.go +++ b/integration/framework/framework.go @@ -220,7 +220,7 @@ func (a dockerActions) RunPause() string { // Run the specified command in a Docker busybox container. func (a dockerActions) RunBusybox(cmd ...string) string { return a.Run(DockerRunArgs{ - Image: "registry.k8s.io/busybox", + Image: "registry.k8s.io/busybox:1.27", }, cmd...) }