Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Using bookworm images #3540

Merged
merged 3 commits into from
Jun 21, 2024
Merged

Using bookworm images #3540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c344ec
Using bookworm images
iwankgb Jun 15, 2024
793d259
libipmctl4 -> libipmctl5
iwankgb Jun 15, 2024
39fbc44
Using Ubuntu 22.04 (bookworm-based) to run unit tests
iwankgb Jun 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build/config/libipmctl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
10 changes: 4 additions & 6 deletions build/integration-in-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"}
Expand Down
Loading