lynxis lazus has uploaded this change for review.

View Change

jobs: libosmo-sigtran: add support for TCAP loadsharing

TCAP loadsharing requires an additional library libosmo-asn1-tcap.
./contrib/jenkins.sh is using the env TCAP={0,1} to select this feature.

Unclear if we should also put it into our default build.

Change-Id: I47c193d8f5ce695fdc6c368eee94d21c5a4b2c6e
---
M coverity/build_Osmocom.sh
M coverity/prepare_source_Osmocom.sh
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
4 files changed, 31 insertions(+), 3 deletions(-)

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

diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh
index 4e2b8db..e6005cd 100755
--- a/coverity/build_Osmocom.sh
+++ b/coverity/build_Osmocom.sh
@@ -75,9 +75,11 @@
 build_libusrp
 build_default libosmo-netif
 build_default libosmo-abis
+build_default libosmo-asn1-tcap
 build_default libosmo-gprs
 build_default libosmo-pfcp
-build_default libosmo-sigtran
+build_default libosmo-sigtran \
+	"--enable-tcap-loadsharing"
 build_default libsmpp34
 build_default libgtpnl
 build_default osmo-ggsn \
diff --git a/coverity/prepare_source_Osmocom.sh b/coverity/prepare_source_Osmocom.sh
index 78f6691..51da337 100755
--- a/coverity/prepare_source_Osmocom.sh
+++ b/coverity/prepare_source_Osmocom.sh
@@ -13,6 +13,7 @@
 PROJECTS="
   libasn1c
   libosmo-abis
+  libosmo-asn1-tcap
   libosmocore
   libosmo-dsp
   libosmo-gprs
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 72d75bc..8bb0658 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -156,7 +156,19 @@
           pipeline_binpkgs: "centos:7 debian:11 debian:13"  # centos7: SYS#6760 (osmo-pcap dep)
 
       - libosmo-pfcp
-      - libosmo-sigtran
+      - libosmo-sigtran:
+          a1_name: TCAP
+          a1: !!python/tuple ["1", "0"]
+          a2_name: WITH_MANUALS
+          a2: !!python/tuple ["1", "0"]
+          combination_filter: >
+            (TCAP == "1" && WITH_MANUALS == "1") ||
+            (TCAP == "0" && WITH_MANUALS == "0")
+          cmd: |
+            {docker_run_ccache} \
+              -e TCAP="$TCAP" \
+              -e WITH_MANUALS="$WITH_MANUALS" \
+              {docker_img} {timeout_cmd} /build/contrib/jenkins.sh
 
       - libosmocore:
           slave_axis: !!python/tuple [io_uring]  # OS#6405
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index 43ae3e8..a1993fd 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -146,7 +146,8 @@
             master-osmo-mgw,
             master-osmo-sgsn
 
-      - libosmo-asn1-tcap
+      - libosmo-asn1-tcap:
+          trigger: master-libosmo-sigtran
 
       - libosmo-dsp:
           repos_url: '{gitea_url}/sdr/{repos}'
@@ -192,6 +193,18 @@
             master-osmo-hnbgw
 
       - libosmo-sigtran:
+          a1_name: TCAP
+          a1: !!python/tuple ["1", "0"]
+          a2_name: WITH_MANUALS
+          a2: !!python/tuple ["1", "0"]
+          combination_filter: >
+            (TCAP == "1" && WITH_MANUALS == "1") ||
+            (TCAP == "0" && WITH_MANUALS == "0")
+          cmd: |
+            {docker_run_ccache} \
+              -e TCAP="$TCAP" \
+              -e WITH_MANUALS="$WITH_MANUALS" \
+              {docker_img} {timeout_cmd} /build/contrib/jenkins.sh
           # Full triggers would be:
           # trigger: >
           #   master-osmo-bsc, master-osmo-iuh, master-osmo-msc,

To view, visit change 41388. To unsubscribe, or for help writing mail filters, visit settings.