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

Change subject: jobs/master,gerrit: use wrapper_core_bt_on_error
......................................................................

jobs/master,gerrit: use wrapper_core_bt_on_error

When the exit code isn't 0, find coredumps and display their backtraces.

Change-Id: Idc893969b158e11d5ae17d0c0a05b52e662f8929
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
2 files changed, 26 insertions(+), 22 deletions(-)

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




diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 5dcc36e..3d8eb38 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -65,6 +65,7 @@
               -w /build \
               -i \
               -u build \
+              -v "$HOME/osmo-ci:/osmo-ci:ro" \
               -v "$PWD:/build" \
     docker_run_ccache: |
             CCACHE_DIR="$HOME/ccache/gerrit-verifications"
@@ -86,6 +87,7 @@
               -w /build \
               -i \
               -u build \
+              -v "$HOME/osmo-ci:/osmo-ci:ro" \
               -v "$PWD:/build" \
               \
               -e CCACHE_DIR="/ccache" \
@@ -97,7 +99,8 @@
     docker_img_aram_applet: 
'registry.osmocom.org/osmocom-build/debian-bookworm-aram-applet'
     docker_img_rp2040: 
'registry.osmocom.org/osmocom-build/debian-bookworm-rp2040'
     timeout_cmd: '/usr/bin/timeout 30m'
-    cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} 
/build/contrib/jenkins.sh'
+    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'
     gerrit_url: 'ssh://[email protected]:29418'
     repos_url: '{gerrit_url}/{repos}'
     gerrit_project: '{repos}'
@@ -158,7 +161,7 @@
           a1_name: arch
           a1: !!python/tuple [arm-none-eabi, amd64]
           combination_filter: '!(arch=="arm-none-eabi" && 
label=="FreeBSD_amd64")'
-          cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} 
/build/contrib/jenkins_arch.sh "$arch"'
+          cmd: '{docker_run_ccache} {docker_img} {wrapper_cmd} 
/build/contrib/jenkins_arch.sh "$arch"'
           pipeline_binpkgs: "centos:7 debian:11 debian:13"  # centos7: SYS#6760

       - libsmpp34
@@ -209,7 +212,7 @@
             {docker_run_ccache} \
               -e FIRMWARE_VERSION="$FIRMWARE_VERSION" \
               -e WITH_MANUALS="$WITH_MANUALS" \
-              "$DOCKER_IMG" {timeout_cmd} $SETARCH_CMD 
/build/contrib/jenkins_bts_model.sh "$BTS_MODEL"
+              "$DOCKER_IMG" {wrapper_cmd} $SETARCH_CMD 
/build/contrib/jenkins_bts_model.sh "$BTS_MODEL"

       - osmo_dia2gsup:
           repos_url: '{gerrit_url}/erlang/{repos}'
@@ -280,7 +283,7 @@
             {docker_run_ccache} \
               -e GTP="$GTP" \
               -e WITH_MANUALS="$WITH_MANUALS" \
-              {docker_img} {timeout_cmd} /build/contrib/jenkins.sh
+              {docker_img} {wrapper_cmd} /build/contrib/jenkins.sh

       - osmo-gsm-manuals

@@ -306,7 +309,7 @@
             {docker_run_ccache} \
               -e IU="$IU" \
               -e WITH_MANUALS="$WITH_MANUALS" \
-              {docker_img} {timeout_cmd} /build/contrib/jenkins.sh
+              {docker_img} {wrapper_cmd} /build/contrib/jenkins.sh

       - osmo-pcap:
           pipeline_binpkgs: "centos:7 debian:11 debian:13"  # centos7: SYS#6760
@@ -342,7 +345,7 @@
               -e with_vty="$with_vty" \
               -e with_dsp="$with_dsp" \
               -e WITH_MANUALS="$WITH_MANUALS" \
-              "$DOCKER_IMG" {timeout_cmd} $SETARCH_CMD 
/build/contrib/jenkins.sh
+              "$DOCKER_IMG" {wrapper_cmd} $SETARCH_CMD 
/build/contrib/jenkins.sh

       - osmo-python-tests:
           repos_url: '{gerrit_url}/python/{repos}'
@@ -386,7 +389,7 @@
             {docker_run_ccache} \
               -e IU="$IU" \
               -e WITH_MANUALS="$WITH_MANUALS" \
-              {docker_img} {timeout_cmd} /build/contrib/jenkins.sh
+              {docker_img} {wrapper_cmd} /build/contrib/jenkins.sh

       - osmo_ss7:
           repos_url: '{gerrit_url}/erlang/{repos}'
@@ -418,7 +421,7 @@
             {docker_run_ccache} \
               -e INSTR="$INSTR" \
               -e WITH_MANUALS="$WITH_MANUALS" \
-              "$DOCKER_IMG" {timeout_cmd} $SETARCH_CMD 
/build/contrib/jenkins.sh
+              "$DOCKER_IMG" {wrapper_cmd} $SETARCH_CMD 
/build/contrib/jenkins.sh

       - osmocom-bb:
           pipeline_binpkgs: "debian:12 debian:13"
@@ -482,7 +485,7 @@
               -e PFCP="$PFCP" \
               -e WITH_MANUALS="$WITH_MANUALS" \
               -e NFTABLES="$NFTABLES" \
-              {docker_img} {timeout_cmd} /build/contrib/jenkins.sh
+              {docker_img} {wrapper_cmd} /build/contrib/jenkins.sh

       - osmo-upf

diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index 1ed04f2..d720dfb 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -82,7 +82,8 @@
     docker_img_aram_applet: 
'registry.osmocom.org/osmocom-build/debian-bookworm-aram-applet'
     docker_img_rp2040: 
'registry.osmocom.org/osmocom-build/debian-bookworm-rp2040'
     timeout_cmd: '/usr/bin/timeout 30m'
-    cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} 
/build/contrib/jenkins.sh'
+    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'
     trigger:
     email: [email protected] [email protected]
     gerrit_url: 'https://gerrit.osmocom.org'
@@ -149,7 +150,7 @@
           repos_url: '{gitea_url}/sdr/{repos}'
           cmd: |
             {docker_run_ccache} \
-              {docker_img} {timeout_cmd} sh -ex -c \
+              {docker_img} {wrapper_cmd} sh -ex -c \
                 'autoreconf -fi; \
                  ./configure; \
                  $MAKE $PARALLEL_MAKE; \
@@ -207,7 +208,7 @@
           a1_name: arch
           a1: !!python/tuple [arm-none-eabi, amd64]
           combination_filter: '!(arch=="arm-none-eabi" && 
label=="FreeBSD_amd64")'
-          cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} 
/build/contrib/jenkins_arch.sh "$arch"'
+          cmd: '{docker_run_ccache} {docker_img} {wrapper_cmd} 
/build/contrib/jenkins_arch.sh "$arch"'
           # Full triggers would be:
           # trigger: >
           #   master-libosmo-netif, master-libosmo-abis, 
master-libosmo-sigtran,
@@ -376,7 +377,7 @@
             {docker_run_ccache} \
               -e GTP="$GTP" \
               -e WITH_MANUALS="$WITH_MANUALS" \
-              {docker_img} {timeout_cmd} /build/contrib/jenkins.sh
+              {docker_img} {wrapper_cmd} /build/contrib/jenkins.sh
           trigger: master-osmo-sgsn

       - osmo-upf
@@ -426,7 +427,7 @@
             {docker_run_ccache} \
               -e IU="$IU" \
               -e WITH_MANUALS="$WITH_MANUALS" \
-              {docker_img} {timeout_cmd} /build/contrib/jenkins.sh
+              {docker_img} {wrapper_cmd} /build/contrib/jenkins.sh

       - osmo-pcap

@@ -460,14 +461,14 @@
               -e with_vty="$with_vty" \
               -e with_dsp="$with_dsp" \
               -e WITH_MANUALS="$WITH_MANUALS" \
-              "$DOCKER_IMG" {timeout_cmd} $SETARCH_CMD 
/build/contrib/jenkins.sh
+              "$DOCKER_IMG" {wrapper_cmd} $SETARCH_CMD 
/build/contrib/jenkins.sh

       - osmo-python-tests:
           repos_url: '{gerrit_url}/python/{repos}'

       - ot290-gsmtap:
           repos_url: '{gitea_url}/phone-side/{repos}'
-          cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} make -C 
/build/src'
+          cmd: '{docker_run_ccache} {docker_img} {wrapper_cmd} make -C 
/build/src'

       - pyosmocom:
           repos_url: '{gerrit_url}/python/{repos}'
@@ -505,7 +506,7 @@
             {docker_run_ccache} \
               -e IU="$IU" \
               -e WITH_MANUALS="$WITH_MANUALS" \
-              {docker_img} {timeout_cmd} /build/contrib/jenkins.sh
+              {docker_img} {wrapper_cmd} /build/contrib/jenkins.sh

       - osmo-sip-connector:
           email: [email protected] [email protected] 
[email protected]
@@ -535,7 +536,7 @@
             {docker_run_ccache} \
               -e INSTR="$INSTR" \
               -e WITH_MANUALS="$WITH_MANUALS" \
-              "$DOCKER_IMG" {timeout_cmd} $SETARCH_CMD 
/build/contrib/jenkins.sh
+              "$DOCKER_IMG" {wrapper_cmd} $SETARCH_CMD 
/build/contrib/jenkins.sh

       - osmocom-bb
       - osmo-sysmon
@@ -564,14 +565,14 @@
           repos_url: '{gitea_url}/sim-card/{repos}'
           email: [email protected] [email protected] 
[email protected]
       - simtrace2:
-          cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} 
/build/contrib/jenkins.sh --publish'
+          cmd: '{docker_run_ccache} {docker_img} {wrapper_cmd} 
/build/contrib/jenkins.sh --publish'
           email: [email protected] [email protected] 
[email protected]
           ssh:
             - binaries_ftp.osmocom.org
             - docs_ftp.osmocom.org
       - osmo-opencm3-projects:
           repos_url: '{gitea_url}/electronics/{repos}'
-          cmd: '{docker_run} {docker_img} {timeout_cmd} 
/build/contrib/jenkins.sh --publish'
+          cmd: '{docker_run} {docker_img} {wrapper_cmd} 
/build/contrib/jenkins.sh --publish'
           email: [email protected] [email protected] 
[email protected]
           ssh:
             - binaries_ftp.osmocom.org
@@ -602,7 +603,7 @@
               -e PFCP="$PFCP" \
               -e WITH_MANUALS="$WITH_MANUALS" \
               -e NFTABLES="$NFTABLES" \
-              {docker_img} {timeout_cmd} /build/contrib/jenkins.sh
+              {docker_img} {wrapper_cmd} /build/contrib/jenkins.sh

       - rtl-sdr:
           repos_url: '{gitea_url}/sdr/{repos}'
@@ -649,7 +650,7 @@
           cmd: |
             rm -rf osmo-ci
             git clone --depth=1 https://gerrit.osmocom.org/osmo-ci -b master
-            {docker_run_ccache} {docker_img} {timeout_cmd} 
/build/osmo-ci/scripts/xgoldmon-jenkins.sh
+            {docker_run_ccache} {docker_img} {wrapper_cmd} 
/build/osmo-ci/scripts/xgoldmon-jenkins.sh

     jobs:
       - 'master-{repos}'

--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41156?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: Idc893969b158e11d5ae17d0c0a05b52e662f8929
Gerrit-Change-Number: 41156
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <[email protected]>
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: osmith <[email protected]>

Reply via email to