From ef9b2c40625ec49102b1a77ec2c9f9dee802b6f8 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Tue, 15 Feb 2022 20:36:07 +0100 Subject: [PATCH] Use docker image debian-bullseye-erlang instead of debian-buster-erlang Let's use newer debian to avoid problems with older erlang. Furthermore, the new image builds rebar3 to avoid issues with unmatching erlang versions. Change-Id: I7b1956c515daccf6ab1ff87031c6fec649cadb4b --- jobs/gerrit-verifications.yml | 2 +- scripts/osmo-ci-docker-rebuild.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 84fe805d..32c3e3b8 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -41,7 +41,7 @@ -v "$PWD:/build" \ -v "$ARTIFACT_STORE:/artifact_store" \ docker_img: '$USER/debian-stretch-jenkins' - docker_img_erlang: '$USER/debian-buster-erlang' + docker_img_erlang: '$USER/debian-bullseye-erlang' timeout_cmd: '/usr/bin/timeout 30m' cmd: '{docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh' gerrit_url: 'ssh://jenkins@gerrit.osmocom.org:29418' diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh index 73b3508b..cf0b102c 100755 --- a/scripts/osmo-ci-docker-rebuild.sh +++ b/scripts/osmo-ci-docker-rebuild.sh @@ -5,7 +5,7 @@ cd "$(dirname "$0")/.." docker_images_require \ "debian-stretch-jenkins" \ "debian-buster-jenkins" \ - "debian-buster-erlang" \ + "debian-bullseye-erlang" \ if [ "$(arch)" = "x86_64" ]; then docker_images_require \