osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/41201?usp=email )

Change subject: scripts/osmo-ci-docker-rebuild: switch to trixie ......................................................................

scripts/osmo-ci-docker-rebuild: switch to trixie

Depends: docker-playground I1c0efb85324b70b6370ea94f74f440e639442da5 Change-Id: I1497f14e57f9d7b0867368b923c8f8919c72cd76 --- M scripts/osmo-ci-docker-rebuild.sh 1 file changed, 7 insertions(+), 2 deletions(-)

Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve

diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh index 1cc1165..d901826 100755 --- a/scripts/osmo-ci-docker-rebuild.sh +++ b/scripts/osmo-ci-docker-rebuild.sh @@ -5,16 +5,21 @@

case "$(arch)" in x86_64) + # OS#6859: still need bookworm for osmo-opencm3-projects docker_images_require \ "debian-bookworm-build" \ - "debian-bookworm-erlang" + "debian-bookworm-erlang" \ + "debian-trixie-build" ;; arm*|aarch64) # OS#6627: need to run a separate "docker pull" command with platform + # OS#6858: still need bookworm for osmo-pcu docker pull docker.io/arm32v7/debian:bookworm --platform="linux/arm/v7" + docker pull docker.io/arm32v7/debian:trixie --platform="linux/arm/v7"

export NO_DOCKER_IMAGE_PULL=1 docker_images_require \ - "debian-bookworm-build-arm" + "debian-bookworm-build-arm" \ + "debian-trixie-build-arm" ;; esac