September 2024 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ci[master]: ansible: update rpi4-2 and rpi4-3

by roh

roh has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/38115?usp=email ) Change subject: ansible: update rpi4-2 and rpi4-3 ...................................................................... ansible: update rpi4-2 and rpi4-3 Adjust SSH key and hostname after both have been reinstalled with 64bit raspbian 12. Related: OS#6549 Change-Id: I959a564bb597f433012a14ce56da4865d3392170 --- M ansible/hosts M ansible/util/known_hosts M jobs/update-osmo-ci-on-slaves.yml 3 files changed, 6 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified roh: Looks good to me, approved diff --git a/ansible/hosts b/ansible/hosts index 7878dfe..f68ea52 100644 --- a/ansible/hosts +++ b/ansible/hosts @@ -12,8 +12,8 @@ build4-deb12build-ansible ansible_host=2a01:4f8:121:200a::1:3 osmocom_jenkins_slave_fstrim=True docker_max_image_space="80 GB" host2-deb11build-ansible ansible_host=2a01:4f8:120:8470::1:4 osmocom_jenkins_slave_fstrim=True docker_max_image_space="80 GB" rpi4-raspbian12build-ansible-1 ansible_host=10.9.25.50 docker_max_image_space="20 GB" -rpi4-raspbian11build-ansible-2 ansible_host=10.9.25.60 docker_max_image_space="20 GB" -rpi4-raspbian11build-ansible-3 ansible_host=10.9.25.70 docker_max_image_space="20 GB" +rpi4-raspbian12build-ansible-2 ansible_host=10.9.25.60 docker_max_image_space="20 GB" +rpi4-raspbian12build-ansible-3 ansible_host=10.9.25.70 docker_max_image_space="20 GB" lx2-raspbian11build-ansible ansible_host=10.9.25.28 docker_max_image_space="20 GB" jenkins_tmpfs=True [simtester] diff --git a/ansible/util/known_hosts b/ansible/util/known_hosts index 8b7fd8e..6067e86 100644 --- a/ansible/util/known_hosts +++ b/ansible/util/known_hosts @@ -3,8 +3,8 @@ 2a01:4f8:212:3762::1:3 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICl7tuOgN64+iYuYCtfCKaUbN9IWzKycpKVRgzsjVCPY 2a01:4f8:120:8470::1:4 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIPKRz2Eg+h6RTREn52n/ip3pzUjRu9pw1XdjWUrvvi/ 10.9.25.50 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKn5hZBA8i3kcCuTORaQtLXf/NqpXxhkoldj9i60GOLo -10.9.25.60 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOAK6SQXmifMamE1VHL/1GmPkk6KhplzT20jSOwb8PyZ -10.9.25.70 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILioWTUt6CyZTceSKqy09mtlNUif+ETKTF6whnWuIROx +10.9.25.60 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMB+zhsSo20QYPGPNNgqknnbx3g8V+MBksHIF3GuPihu +10.9.25.70 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ4KE0enH9e76eWTy8HLFO/2pzrZaP8G93mtWvfD8//W 2a01:4f8:121:200a::1:3 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGafw2VdeZo4YNvbu8VEBjDrsCFL+ZSbHtvhspNIQ9PR 2a01:4f8:121:200a::1:2 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFyp0daWkfsRHErCVCcP/FZmtiRvFNAsK2A5TlQ6Ja+P 10.9.25.28 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG0rQGxSxWJHwNNT5XdeuMPSYCAXpcDnFDzvyw5+sH3l diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml index 5da7d46..b4994f7 100644 --- a/jobs/update-osmo-ci-on-slaves.yml +++ b/jobs/update-osmo-ci-on-slaves.yml @@ -13,8 +13,8 @@ - host2-deb11build-ansible - lx2-raspbian11build-ansible - rpi4-raspbian12build-ansible-1 - - rpi4-raspbian11build-ansible-2 - - rpi4-raspbian11build-ansible-3 + - rpi4-raspbian12build-ansible-2 + - rpi4-raspbian12build-ansible-3 - simtester properties: - build-discarder: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38115?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: I959a564bb597f433012a14ce56da4865d3392170 Gerrit-Change-Number: 38115 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: roh <jsteiger(a)sysmocom.de>

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: ansible: update rpi4-2 and rpi4-3

by roh

Attention is currently required from: osmith. roh has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/38115?usp=email ) Change subject: ansible: update rpi4-2 and rpi4-3 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38115?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I959a564bb597f433012a14ce56da4865d3392170 Gerrit-Change-Number: 38115 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: roh <jsteiger(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 12 Sep 2024 13:24:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

9 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ci[master]: OBS: add libosmo-sccp-legacy URL

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/38121?usp=email ) Change subject: OBS: add libosmo-sccp-legacy URL ...................................................................... OBS: add libosmo-sccp-legacy URL Change-Id: Ibacb7e39525f679914ad6add8aa21fce59ca3e5d --- M scripts/obs/lib/config.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py index 378fd32..746bb1c 100644 --- a/scripts/obs/lib/config.py +++ b/scripts/obs/lib/config.py @@ -109,6 +109,7 @@ "osmo-fl2k": "https://gitea.osmocom.org/sdr/osmo-fl2k", "rtl-sdr": "https://gitea.osmocom.org/sdr/rtl-sdr", "strongswan-epdg": "https://gitea.osmocom.org/ims-volte-vowifi/strongswan-epdg", + "libosmo-sccp-legacy": "https://gitea.osmocom.org/osmocom/libosmo-sccp-legacy", } git_branch_default = "master" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38121?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: Ibacb7e39525f679914ad6add8aa21fce59ca3e5d Gerrit-Change-Number: 38121 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

9 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ci[master]: OBS: add libosmo-sccp-legacy URL

by osmith

osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/38121?usp=email ) Change subject: OBS: add libosmo-sccp-legacy URL ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: trivial patch, fixes Osmocom_OBS_* jobs from failing -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38121?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibacb7e39525f679914ad6add8aa21fce59ca3e5d Gerrit-Change-Number: 38121 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 12 Sep 2024 13:22:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

9 months, 2 weeks

1
0
0 0

[XS] Change in docker-playground[master]: osmo-stp-master: libosmo-sccp -> libosmo-sigtran

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/38122?usp=email ) Change subject: osmo-stp-master: libosmo-sccp -> libosmo-sigtran ...................................................................... osmo-stp-master: libosmo-sccp -> libosmo-sigtran Related: OS#6239 Change-Id: Ifc8dea67746a0f785831c6b0c6b7dd391d3afa52 --- M osmo-stp-master/Dockerfile 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/22/38122/1 diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile index 2e6ecd6..d40ab2f 100644 --- a/osmo-stp-master/Dockerfile +++ b/osmo-stp-master/Dockerfile @@ -25,10 +25,10 @@ ARG OSMO_STP_BRANCH="master" -RUN git clone https://gerrit.osmocom.org/libosmo-sccp.git -ADD https://gerrit.osmocom.org/plugins/gitiles/libosmo-sccp/+/$OSMO_STP_BRANCH?… /tmp/commit-libosmo-sccp +RUN git clone https://gerrit.osmocom.org/libosmo-sigtran.git +ADD https://gerrit.osmocom.org/plugins/gitiles/libosmo-sigtran/+/$OSMO_STP_BRAN… /tmp/commit-libosmo-sigtran -RUN cd libosmo-sccp && \ +RUN cd libosmo-sigtran && \ git fetch && git checkout $OSMO_STP_BRANCH && \ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_STP_BRANCH || exit 1); \ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/38122?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ifc8dea67746a0f785831c6b0c6b7dd391d3afa52 Gerrit-Change-Number: 38122 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

9 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ci[master]: OBS: add libosmo-sccp-legacy URL

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/38121?usp=email ) Change subject: OBS: add libosmo-sccp-legacy URL ...................................................................... OBS: add libosmo-sccp-legacy URL Change-Id: Ibacb7e39525f679914ad6add8aa21fce59ca3e5d --- M scripts/obs/lib/config.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/21/38121/1 diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py index 378fd32..746bb1c 100644 --- a/scripts/obs/lib/config.py +++ b/scripts/obs/lib/config.py @@ -109,6 +109,7 @@ "osmo-fl2k": "https://gitea.osmocom.org/sdr/osmo-fl2k", "rtl-sdr": "https://gitea.osmocom.org/sdr/rtl-sdr", "strongswan-epdg": "https://gitea.osmocom.org/ims-volte-vowifi/strongswan-epdg", + "libosmo-sccp-legacy": "https://gitea.osmocom.org/osmocom/libosmo-sccp-legacy", } git_branch_default = "master" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38121?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibacb7e39525f679914ad6add8aa21fce59ca3e5d Gerrit-Change-Number: 38121 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

9 months, 2 weeks

1
0
0 0

[NoOp] Change in libosmo-sigtran[master]: (do not merge) test ci

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38120?usp=email ) Change subject: (do not merge) test ci ...................................................................... (do not merge) test ci Change-Id: I0f421b9b5134646725e6182c049035e3f41a0f5c --- A test 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/20/38120/1 diff --git a/test b/test new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38120?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I0f421b9b5134646725e6182c049035e3f41a0f5c Gerrit-Change-Number: 38120 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

9 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/osmo-gsm-tester-build: fix Missing parameter

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/38088?usp=email ) Change subject: jobs/osmo-gsm-tester-build: fix Missing parameter ...................................................................... jobs/osmo-gsm-tester-build: fix Missing parameter Use OSMO_GSM_TESTER_BRANCH as shell variable ('$...'), not as jenkins job builder parameter (${...}). This is how we do it in other jobs as well, e.g. jobs/osmocom-obs.yml. Apparently the workaround in the file happened to work earlier, but it does not work anymore with Jenkins Job Builder version 6.3.0. Remove it. Fix for: osmo-gsm-tester-builder.yml:119:15: While formatting string '${OSMO_GSM_TESTER_BRANCH}': Missing parameter: 'OSMO_GSM_TESTER_BRANCH' - ${OSMO_GSM_TESTER_BRANCH} ^ Change-Id: I3b6b16964a4d8a51fd3ecc0d670805182a8c6586 --- M jobs/osmo-gsm-tester-builder.yml 1 file changed, 1 insertion(+), 8 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/jobs/osmo-gsm-tester-builder.yml b/jobs/osmo-gsm-tester-builder.yml index 262663f..ba925d0 100644 --- a/jobs/osmo-gsm-tester-builder.yml +++ b/jobs/osmo-gsm-tester-builder.yml @@ -106,17 +106,10 @@ - add_param_build_branch: name: OSMO_GSM_TESTER_BUILD_srslte scm: - - osmo-gsm-tester-repo - -# The repo must be used seperate to workaround the bug "Can not expand OSMO_GSM_TESTER_BRANCH". -# The safe-guard check to not use un-defined variables seems to be broken. -- scm: - name: osmo-gsm-tester-repo - scm: - git: url: https://gerrit.osmocom.org/osmo-gsm-tester branches: - - ${OSMO_GSM_TESTER_BRANCH} + - '$OSMO_GSM_TESTER_BRANCH' wipe-workspace: false skip-tag: true basedir: osmo-gsm-tester -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38088?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: I3b6b16964a4d8a51fd3ecc0d670805182a8c6586 Gerrit-Change-Number: 38088 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: libosmo-sccp -> libosmo-sigtran

by osmith

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 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38116?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: I509b1cc2a5260c82ef32e9543513110949311188 Gerrit-Change-Number: 38116 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-trx[master]: contrib/jenkins: remove broken chroot + qemu code

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/38114?usp=email ) Change subject: contrib/jenkins: remove broken chroot + qemu code ...................................................................... contrib/jenkins: remove broken chroot + qemu code The mirror where it would download images from is not online anymore, and it looks like this whole block has not been executed in years (we always test the arm builds on native arm machines nowadays, and run all builds in docker). Replace the whole block with a simple check that ensures when arm flags are used, that the build is actually running on an arm machine. Change-Id: I2e204e4a0a7dfcf32f011ed6fb403b564f8155a7 --- M contrib/jenkins.sh 1 file changed, 13 insertions(+), 54 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 73d3ffd..8aeeb41 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -9,60 +9,19 @@ # set -ex -substr() { [ -z "${2##*$1*}" ]; } - -#apt-get install qemu qemu-user-static qemu-system-arm debootstrap fakeroot proot -mychroot_nocwd() { - # LC_ALL + LANGUAGE set to avoid lots of print errors due to locale not being set inside container - # PATH is needed to be able to reach binaries like ldconfig without logging in to root, which adds the paths to PATH. - # PROOT_NO_SECCOMP is required due to proot bug #106 - LC_ALL=C LANGUAGE=C PATH="$PATH:/usr/sbin:/sbin" PROOT_NO_SECCOMP=1 proot -r "$ROOTFS" -w / -b /proc --root-id -q qemu-arm-static "$@" -} - -mychroot() { - mychroot_nocwd -w / "$@" -} - -if [ -z "${INSIDE_CHROOT}" ]; then - - # Only use ARM chroot if host is not ARM and the target is ARM: - if ! $(substr "arm" "$(uname -m)") && [ "x${INSTR}" = "x--with-neon" -o "x${INSTR}" = "x--with-neon-vfpv4" ]; then - - OSMOTRX_DIR="$PWD" # we assume we are called as contrib/jenkins.sh - ROOTFS_PREFIX="${ROOTFS_PREFIX:-$HOME}" - ROOTFS="${ROOTFS_PREFIX}/qemu-img" - mkdir -p "${ROOTFS_PREFIX}" - - # Prepare chroot: - if [ ! -d "$ROOTFS" ]; then - mkdir -p "$ROOTFS" - if [ "x${USE_DEBOOTSTRAP}" = "x1" ]; then - fakeroot qemu-debootstrap --foreign --include="linux-image-armmp-lpae" --arch=armhf stretch "$ROOTFS" http://ftp.de.debian.org/debian/ - # Hack to avoid debootstrap trying to mount /proc, as it will fail with "no permissions" and anyway proot takes care of it: - sed -i "s/setup_proc//g" "$ROOTFS/debootstrap/suite-script" - mychroot /debootstrap/debootstrap --second-stage --verbose http://ftp.de.debian.org/debian/ - else - YESTERDAY=$(python -c 'import datetime ; print((datetime.datetime.now() - datetime.timedelta(days=1)).strftime("%Y%m%d"))') - wget -nc -q "https://uk.images.linuxcontainers.org/images/debian/stretch/armhf/default/$…" - tar -xf rootfs.tar.xz -C "$ROOTFS/" || true - echo "nameserver 8.8.8.8" > "$ROOTFS/etc/resolv.conf" - fi - mychroot -b /dev apt-get update - mychroot apt-get -y install build-essential dh-autoreconf pkg-config libuhd-dev libusb-1.0-0-dev libusb-dev git libtalloc-dev libgnutls28-dev stow - fi - # Run jenkins.sh inside the chroot: - INSIDE_CHROOT=1 mychroot_nocwd \ - -w /osmo-trx \ - -b "$OSMOTRX_DIR:/osmo-trx" \ - -b "$(which osmo-clean-workspace.sh):/usr/bin/osmo-clean-workspace.sh" \ - -b "$(which osmo-build-dep.sh):/usr/bin/osmo-build-dep.sh" \ - -b "$(which osmo-deps.sh):/usr/bin/osmo-deps.sh" \ - ./contrib/jenkins.sh - exit 0 - fi -fi - -set -ex +case "$INSTR" in + "--with-neon"*) + case "$(arch)" in + arm*) + ;; + *) + set +x + echo "ERROR: trying to build with INSTR=$INSTR but not running on a 32-bit arm machine! (arch=$(arch))" + exit 1 + ;; + esac + ;; +esac if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/38114?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2e204e4a0a7dfcf32f011ed6fb403b564f8155a7 Gerrit-Change-Number: 38114 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

9 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2024