[S] Change in osmo-ci[master]: jobs: gerrit/master: run pysim with new image
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/43967?usp=email ) Change subject: jobs: gerrit/master: run pysim with new image ...................................................................... jobs: gerrit/master: run pysim with new image I've made a split pysim-build image (from debian-trixie-build) to fix a conflict while installing dependencies. Use the new image. Related: OS#7111 Depends: docker-playground I2da5fb928d20c27f373606a8aa7bccefa40c09ce Change-Id: I34b622d3d367510a6343088bb3a80f950944bdd6 --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml M jobs/registry-rebuild-upload.yml 3 files changed, 10 insertions(+), 2 deletions(-) Approvals: jolly: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 034d02b..5f5af84 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -68,6 +68,7 @@ -i \ -u build \ -v "$HOME/osmo-ci:/osmo-ci:ro" \ + -v "$HOME/osmo-gsm-manuals:/opt/osmo-gsm-manuals:ro" \ -v "$PWD:/build" \ docker_run_ccache: | CCACHE_DIR="$HOME/ccache/gerrit-verifications" @@ -101,6 +102,7 @@ docker_img_android: 'registry.osmocom.org/osmocom-build/debian-bookworm-android' docker_img_aram_applet: 'registry.osmocom.org/osmocom-build/debian-bookworm-aram-applet' docker_img_rp2040: 'registry.osmocom.org/osmocom-build/debian-bookworm-rp2040' + docker_img_pysim: 'registry.osmocom.org/osmocom-build/pysim-build' timeout_cmd: '/usr/bin/timeout 30m' wrapper_cmd: '{timeout_cmd} /osmo-ci/scripts/wrapper_core_bt_on_error.sh' cmd: '{docker_run_ccache} {docker_img} {wrapper_cmd} /build/contrib/jenkins.sh' @@ -570,9 +572,10 @@ fi ;; *) + docker pull {docker_img_pysim} {docker_run} \ -e JOB_TYPE="$JOB_TYPE" \ - {docker_img} \ + {docker_img_pysim} \ {timeout_cmd} /build/contrib/jenkins.sh ;; esac diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index a0c0ad7..0d5f23e 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -45,6 +45,7 @@ -u build \ -v $(readlink -f $SSH_AUTH_SOCK):/ssh-agent \ -v "$HOME/osmo-ci:/osmo-ci:ro" \ + -v "$HOME/osmo-gsm-manuals:/opt/osmo-gsm-manuals:ro" \ -v "$PWD:/build" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ docker_run_ccache: | @@ -84,6 +85,7 @@ docker_img_android: 'registry.osmocom.org/osmocom-build/debian-bookworm-android' docker_img_aram_applet: 'registry.osmocom.org/osmocom-build/debian-bookworm-aram-applet' docker_img_rp2040: 'registry.osmocom.org/osmocom-build/debian-bookworm-rp2040' + docker_img_pysim: 'registry.osmocom.org/osmocom-build/pysim-build' timeout_cmd: '/usr/bin/timeout 30m' wrapper_cmd: '{timeout_cmd} /osmo-ci/scripts/wrapper_core_bt_on_error.sh' cmd: '{docker_run_ccache} {docker_img} {wrapper_cmd} /build/contrib/jenkins.sh' @@ -665,9 +667,10 @@ {timeout_cmd} ./contrib/jenkins.sh ;; *) + docker pull {docker_img_pysim} {docker_run} \ -e JOB_TYPE="$JOB_TYPE" \ - {docker_img} \ + {docker_img_pysim} \ {timeout_cmd} /build/contrib/jenkins.sh ;; esac diff --git a/jobs/registry-rebuild-upload.yml b/jobs/registry-rebuild-upload.yml index 21d1335..9244970 100644 --- a/jobs/registry-rebuild-upload.yml +++ b/jobs/registry-rebuild-upload.yml @@ -9,6 +9,8 @@ image: "debian-bookworm-aram-applet" - registry-rebuild-upload-rp2040: image: "debian-bookworm-rp2040" + - registry-rebuild-upload-pysim-build: + image: "pysim-build" - job-template: name: '{job-name}' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43967?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: I34b622d3d367510a6343088bb3a80f950944bdd6 Gerrit-Change-Number: 43967 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> Gerrit-Reviewer: jolly <andreas@eversberg.eu> Gerrit-Reviewer: osmith <osmith@sysmocom.de> Gerrit-Reviewer: pespin <pespin@sysmocom.de>
participants (1)
-
osmith