osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/41388?usp=email ) Change subject: jobs: libosmo-sigtran: add support for TCAP loadsharing ...................................................................... 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(-) Approvals: fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified 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..09714fa 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: WITH_TCAP + a1: !!python/tuple ["1", "0"] + a2_name: WITH_MANUALS + a2: !!python/tuple ["1", "0"] + combination_filter: > + (WITH_TCAP == "1" && WITH_MANUALS == "1") || + (WITH_TCAP == "0" && WITH_MANUALS == "0") + cmd: | + {docker_run_ccache} \ + -e WITH_TCAP="$WITH_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..19123d9 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: WITH_TCAP + a1: !!python/tuple ["1", "0"] + a2_name: WITH_MANUALS + a2: !!python/tuple ["1", "0"] + combination_filter: > + (WITH_TCAP == "1" && WITH_MANUALS == "1") || + (WITH_TCAP == "0" && WITH_MANUALS == "0") + cmd: | + {docker_run_ccache} \ + -e WITH_TCAP="$WITH_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 https://gerrit.osmocom.org/c/osmo-ci/+/41388?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: I47c193d8f5ce695fdc6c368eee94d21c5a4b2c6e Gerrit-Change-Number: 41388 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> Gerrit-Reviewer: osmith <osmith@sysmocom.de>