osmith has uploaded this change for review.

View Change

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, 6 insertions(+), 2 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/67/43967/1

diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 034d02b..0f6807e 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -101,6 +101,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'
     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'
@@ -572,7 +573,7 @@
             *)
               {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..d1ace34 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -84,6 +84,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'
@@ -667,7 +668,7 @@
             *)
               {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 change 43967. To unsubscribe, or for help writing mail filters, visit settings.