osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/41202?usp=email )
Change subject: jobs/gerrit,master: use debian-trixie-build
......................................................................
jobs/gerrit,master: use debian-trixie-build
Change-Id: Id65b7f9045e13bed38c1de514cdd537fac88f60f
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
2 files changed, 8 insertions(+), 6 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 614abde..72d75bc 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -95,7 +95,7 @@
-e CCACHE_DIR="/ccache" \
-e
PATH="/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
\
-v "$CCACHE_DIR:/ccache" \
- docker_img: '$USER/debian-bookworm-build'
+ docker_img: '$USER/debian-trixie-build'
docker_img_erlang: '$USER/debian-bookworm-erlang'
docker_img_android:
'registry.osmocom.org/osmocom-build/debian-bookworm-android'
docker_img_aram_applet:
'registry.osmocom.org/osmocom-build/debian-bookworm-aram-applet'
@@ -338,7 +338,7 @@
DOCKER_IMG="{docker_img}"
case "$(arch)" in
arm*|aarch64)
- DOCKER_IMG="$DOCKER_IMG-arm"
+ DOCKER_IMG="$USER/debian-bookworm-build-arm" # OS#6858
SETARCH_CMD="setarch linux32"
;;
esac
@@ -445,7 +445,8 @@
- simtrace2
- osmo-opencm3-projects:
- cmd: '{docker_run} {docker_img} {timeout_cmd}
/build/contrib/jenkins.sh'
+ # bookworm: OS#6859
+ cmd: '{docker_run} $USER/debian-bookworm-build {wrapper_cmd}
/build/contrib/jenkins.sh'
pipeline_binpkgs: ""
- osmo-asf4-dfu:
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index fec014e..43ae3e8 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -78,7 +78,7 @@
-e CCACHE_DIR="/ccache" \
-e
PATH="/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
\
-v "$CCACHE_DIR:/ccache" \
- docker_img: '$USER/debian-bookworm-build'
+ docker_img: '$USER/debian-trixie-build'
docker_img_erlang: '$USER/debian-bookworm-erlang'
docker_img_android:
'registry.osmocom.org/osmocom-build/debian-bookworm-android'
docker_img_aram_applet:
'registry.osmocom.org/osmocom-build/debian-bookworm-aram-applet'
@@ -454,7 +454,7 @@
DOCKER_IMG="{docker_img}"
case "$(arch)" in
arm*|aarch64)
- DOCKER_IMG="$DOCKER_IMG-arm"
+ DOCKER_IMG="$USER/debian-bookworm-build-arm" # OS#6858
SETARCH_CMD="setarch linux32"
;;
esac
@@ -574,7 +574,8 @@
- docs_ftp.osmocom.org
- osmo-opencm3-projects:
repos_url: '{gitea_url}/electronics/{repos}'
- cmd: '{docker_run} {docker_img} {wrapper_cmd}
/build/contrib/jenkins.sh --publish'
+ # bookworm: OS#6859
+ cmd: '{docker_run} $USER/debian-bookworm-build {wrapper_cmd}
/build/contrib/jenkins.sh --publish'
email: [email protected] [email protected]
[email protected]
ssh:
- binaries_ftp.osmocom.org
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41202?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Id65b7f9045e13bed38c1de514cdd537fac88f60f
Gerrit-Change-Number: 41202
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: osmith <[email protected]>
