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

Change subject: libosmo-sccp -> libosmo-sigtran ......................................................................

libosmo-sccp -> libosmo-sigtran

Adjust to: * libosmo-sccp.git has been renamed to libosmo-sigtran.git * libosmo-sccp static libraries have been split into libosmo-sccp-legacy.git

build-old-tags-against-master: libosmo-sccp is intentionally kept in REPOS_TAGS, so old libosmo-sccp versions are built against current master of Osmocom libraries.

Related: OS#6239 Change-Id: I509b1cc2a5260c82ef32e9543513110949311188 --- M coverity/build_Osmocom.sh M coverity/prepare_source_Osmocom.sh M jobs/gerrit-verifications.yml M jobs/master-builds.yml M jobs/osmo-gsm-tester-builder.yml M scripts/common.sh M scripts/manuals/publish-manuals-for-tags.sh M scripts/obs/lib/config.py M scripts/osmo-depcheck/config.py M scripts/osmocom-api-doxygen.sh M scripts/osmocom-build-old-tags-against-master.sh M scripts/tarballs/publish-tarballs-for-tags.sh 12 files changed, 24 insertions(+), 19 deletions(-)

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

diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index 61bd2b7..22ca629 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -77,7 +77,7 @@ build_default libosmo-gprs build_default libosmo-netif build_default libosmo-pfcp -build_default libosmo-sccp +build_default libosmo-sigtran 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 2c69356..d7ac90b 100755 --- a/coverity/prepare_source_Osmocom.sh +++ b/coverity/prepare_source_Osmocom.sh @@ -18,7 +18,7 @@ libosmo-gprs libosmo-netif libosmo-pfcp - libosmo-sccp + libosmo-sigtran libsmpp34 libusrp osmo-bsc diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index f68102b..a21e42a 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -113,7 +113,7 @@ - libosmo-gprs - libosmo-netif - libosmo-pfcp - - libosmo-sccp + - libosmo-sigtran

- libosmocore: slave_axis: !!python/tuple [io_uring] # OS#6405 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 3b5f254..aceed0e 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -129,13 +129,13 @@ - libosmo-netif: # Full triggers would be: # trigger: > - # master-libosmo-sccp, mastere-osmo-hlr, master-osmo-iuh, + # master-libosmo-sigtran, mastere-osmo-hlr, master-osmo-iuh, # master-osmo-mgw, master-osmo-msc, master-osmo-sgsn, master-osmo-hnodeb, # master-osmo-hnbgw # Optimized: # (see comment at libosmocore) trigger: > - master-libosmo-sccp, + master-libosmo-sigtran, master-osmo-hlr, master-osmo-mgw, master-osmo-sgsn @@ -150,7 +150,7 @@ master-osmo-upf, master-osmo-hnbgw

- - libosmo-sccp: + - libosmo-sigtran: # Full triggers would be: # trigger: > # master-osmo-bsc, master-osmo-iuh, master-osmo-msc, @@ -172,7 +172,7 @@ cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} /build/contrib/jenkins_arch.sh "$arch"' # Full triggers would be: # trigger: > - # master-libosmo-abis, master-libosmo-netif, master-libosmo-sccp, + # master-libosmo-abis, master-libosmo-netif, master-libosmo-sigtran, # master-osmo-bsc, master-osmo-bts, master-osmo-ggsn, master-osmo-gmr, master-osmo-hlr, # master-osmo-iuh, master-osmo-mgw, master-osmo-msc, master-osmo-pcap, master-osmo-pcu, # master-osmo-sgsn, master-osmo-sip-connector, master-osmo-tetra, master-osmo-hnodeb @@ -181,7 +181,7 @@ # libosmocore # -> master-libosmo-abis # -> master-libosmo-netif - # -> master-libosmo-sccp + # -> master-libosmo-sigtran # -> master-osmo-bsc # -> master-osmo-bsc-nat # -> master-osmo-iuh diff --git a/jobs/osmo-gsm-tester-builder.yml b/jobs/osmo-gsm-tester-builder.yml index ba925d0..ec9c29f 100644 --- a/jobs/osmo-gsm-tester-builder.yml +++ b/jobs/osmo-gsm-tester-builder.yml @@ -18,7 +18,7 @@ - osmo-trx - osmocom-bb - osmo-stp: - triggered-by: master-libosmo-sccp + triggered-by: master-libosmo-sigtran - osmo-bts-sysmo: triggered-by: master-osmo-bts - osmo-pcu-sysmo: diff --git a/scripts/common.sh b/scripts/common.sh index b4ab685..01548b8 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -13,7 +13,8 @@ libosmo-gprs libosmo-netif libosmo-pfcp - libosmo-sccp + libosmo-sccp-legacy + libosmo-sigtran libosmocore libsmpp34 libusrp diff --git a/scripts/manuals/publish-manuals-for-tags.sh b/scripts/manuals/publish-manuals-for-tags.sh index 8ca34a6..acf8557 100755 --- a/scripts/manuals/publish-manuals-for-tags.sh +++ b/scripts/manuals/publish-manuals-for-tags.sh @@ -233,7 +233,7 @@ get_repo_name_from_docs_dir() { case "$1" in osmo-stp) - echo "libosmo-sccp" + echo "libosmo-sigtran" ;; *) echo "$1" @@ -244,7 +244,7 @@ # $1: repo name get_docs_dir_from_repo_name() { case "$1" in - libosmo-sccp) + libosmo-sigtran) echo "osmo-stp" ;; *) diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py index 5b919d9..378fd32 100644 --- a/scripts/obs/lib/config.py +++ b/scripts/obs/lib/config.py @@ -58,7 +58,8 @@ "libosmo-gprs", "libosmo-netif", "libosmo-pfcp", - "libosmo-sccp", + "libosmo-sccp-legacy", # can be dropped after osmo-msc >= 1.12.x release + "libosmo-sigtran", "libosmocore", "libsmpp34", "libusrp", diff --git a/scripts/osmo-depcheck/config.py b/scripts/osmo-depcheck/config.py index 708c0ac..39c79b4 100644 --- a/scripts/osmo-depcheck/config.py +++ b/scripts/osmo-depcheck/config.py @@ -36,9 +36,10 @@ "libosmovty"), "libosmo-abis": ("libosmoabis", "libosmotrau"), - "libosmo-sccp": ("libosmo-mtp", - "libosmo-sigtran", - "libosmo-xua"), + "libosmo-sigtran": ("libosmo-sigtran"), + "libosmo-sccp-legacy": ("libosmo-mtp", + "libosmo-sccp", + "libosmo-xua"), "osmo-ggsn": ("libgtp"), "osmo-hlr": ("libosmo-gsup-client"), "osmo-iuh": ("libosmo-ranap"), diff --git a/scripts/osmocom-api-doxygen.sh b/scripts/osmocom-api-doxygen.sh index cfa5e61..0b9a965 100755 --- a/scripts/osmocom-api-doxygen.sh +++ b/scripts/osmocom-api-doxygen.sh @@ -8,7 +8,7 @@ libosmo-abis libosmo-dsp libosmo-netif - libosmo-sccp + libosmo-sigtran osmo-gmr "

diff --git a/scripts/osmocom-build-old-tags-against-master.sh b/scripts/osmocom-build-old-tags-against-master.sh index 6d20591..eaf73088 100755 --- a/scripts/osmocom-build-old-tags-against-master.sh +++ b/scripts/osmocom-build-old-tags-against-master.sh @@ -16,7 +16,7 @@ libosmocore libosmo-abis libosmo-netif - libosmo-sccp + libosmo-sigtran libosmo-sccp-legacy libsmpp34 libasn1c @@ -31,6 +31,7 @@ libosmocore libosmo-netif libosmo-sccp + libosmo-sigtran osmo-bsc osmo-bts osmo-ggsn diff --git a/scripts/tarballs/publish-tarballs-for-tags.sh b/scripts/tarballs/publish-tarballs-for-tags.sh index 09cd5cd..93e861b 100755 --- a/scripts/tarballs/publish-tarballs-for-tags.sh +++ b/scripts/tarballs/publish-tarballs-for-tags.sh @@ -14,7 +14,8 @@ libosmo-abis libosmo-netif libosmo-pfcp - libosmo-sccp + libosmo-sccp-legacy + libosmo-sigtran libosmocore libsmpp34 libusrp