osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43170?usp=email )
Change subject: deps: fetch/clone: retry with backoff time
......................................................................
deps: fetch/clone: retry with backoff time
Replace the previous logic of running the whole Makefile again on any
failure, with wrapping all git clone and fetch commands in a new
retry_with_backoff_time function that actually sleeps before retrying
(a random amount of seconds to make less requests at once), and retries
up to 5 times, each time with likely more sleep time.
With this change it is more likely to succeed and we have less confusing
output as deps/Makefile will not run twice if it fails for any reason
(e.g. a syntax error).
Change-Id: I317c0357ff330a0626a622dadd1e44ba65b99545
---
M Makefile
M deps/update.sh
2 files changed, 29 insertions(+), 6 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/Makefile b/Makefile
index 9cafa4c..b58fcf3 100644
--- a/Makefile
+++ b/Makefile
@@ -77,10 +77,8 @@
default: deps all
-# Eclipse GitLab has rate limiting and sometimes to many concurrent conns fail.
-# If -jN fails, retry with -j1.
.make.deps: deps/Makefile
- ($(MAKE) $(PARALLEL_MAKE) -C deps || $(MAKE) -j1 -C deps)
+ $(MAKE) $(PARALLEL_MAKE) -C deps
touch $@
.PHONY: deps
diff --git a/deps/update.sh b/deps/update.sh
index 64c5b54..1307045 100755
--- a/deps/update.sh
+++ b/deps/update.sh
@@ -14,6 +14,31 @@
esac
}
+# Eclipse GitLab has rate limiting and sometimes too many concurrent
+# connections fail. If that happens, sleep and try again in a few (random)
+# seconds, to give less concurrent load to the server.
+retry_with_backoff_time() {
+ local max=5
+ local sec
+ local i
+
+ for i in $(seq 1 $max); do
+ if "$@"; then
+ return
+ fi
+
+ if [ $i -lt $max ]; then
+ sec=$(($i * $(shuf -i 1-10 -n1)))
+ echo "[$DIR] Failed ($i/$max), retrying in ${sec}s..."
+ sleep $sec
+ else
+ echo "[$DIR] Failed ($i/$max), giving up!"
+ exit 1
+ fi
+ echo "[$DIR] Retrying: $@"
+ done
+}
+
update_url() {
local current="$(git -C "$DIR" remote get-url origin)"
local full_url="$(get_full_url)"
@@ -21,7 +46,7 @@
if [ "$current" != "$full_url" ]; then
echo "[$DIR] Updating URL to $full_url"
git -C "$DIR" remote set-url origin "$full_url"
- git -C "$DIR" fetch
+ retry_with_backoff_time git -C "$DIR" fetch
fi
}
@@ -29,7 +54,7 @@
update_url
else
echo "[$DIR] Initial git clone"
- git clone -q "$(get_full_url)"
+ retry_with_backoff_time git clone -q "$(get_full_url)"
fi
cd "$DIR"
@@ -41,7 +66,7 @@
if ! git cat-file -e "$COMMIT"; then
echo "[$DIR] Missing $COMMIT, fetching git repository"
- git fetch
+ retry_with_backoff_time git fetch
fi
if git rev-parse -q "origin/$COMMIT" 1>/dev/null 2>&1; then
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43170?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I317c0357ff330a0626a622dadd1e44ba65b99545
Gerrit-Change-Number: 43170
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>
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43167?usp=email )
Change subject: deps: move "git clone" logic into update.sh
......................................................................
deps: move "git clone" logic into update.sh
Prepare to have more logic for cloning and updating git repositories in
the script, see follow-up patches. The purpose of this patch series is
to fix the rate limiting errors we are seeing from gitlab eclipse, that
lead to aborts of our ttcn3 jobs:
[titan.ProtocolModules.ROSE] Updating URL to https://gitlab.eclipse.org/eclipse/titan/titan.ProtocolModules.ROSE
remote: You have reached the limit of requests you can make to Eclipse GitLab. This could be caused by too many open tabs, which query the GitLab server in the background. Please close unused tabs, or put them to sleep so they don't issue requests needlessly.
fatal: unable to access 'https://gitlab.eclipse.org/eclipse/titan/titan.ProtocolModules.M3UA/': The requested URL returned error: 429
make[1]: *** [Makefile:174: titan.ProtocolModules.M3UA/update] Error 128
Change-Id: I7c1647edd11afac657acaf6add08903373eae585
---
M deps/Makefile
M deps/update.sh
2 files changed, 15 insertions(+), 8 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
diff --git a/deps/Makefile b/deps/Makefile
index 306f1b2..4a6bd90 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -135,12 +135,8 @@
$(1)_HEAD!= if [ -d $(1) ]; then cd $(1) && git describe --tags 2>/dev/null || git rev-parse HEAD; fi
$(1)_MODIFIED!= if [ -d $(1) ]; then cd $(1) && git diff --quiet --exit-code || echo -n "1"; fi
-$(1):
- @echo "[$(1)] Initial git clone"
- @git clone -q $(2)/$(1)
-
.PHONY: $(1)/update
-$(1)/update: $(1)
+$(1)/update:
ifeq ($$($(1)_MODIFIED),1)
@echo "WARNING: $(1) skipped because it contains uncommitted modifications!"
else
@@ -149,16 +145,21 @@
@cd $(1) && git remote set-url origin $(2)/$(1) && git fetch
endif
ifneq ($$($(1)_HEAD),$($(1)_commit))
- @./update.sh "$(1)" "$($(1)_commit)"
+ @./update.sh "$(1)" "$($(1)_commit)" "$(2)"
endif
endif
.PHONY: $(1)/clean
-$(1)/clean: $(1)
+$(1)/clean:
ifeq ($$($(1)_MODIFIED),1)
@echo "WARNING: $(1) skipped because it contains uncommitted modifications!"
else
- cd $(1) && git fetch && git checkout -q -f "$($(1)_commit)" && git reset --hard
+ if [ -d $(1) ]; then \
+ cd $(1) && \
+ git fetch && \
+ git checkout -q -f "$($(1)_commit)" && \
+ git reset --hard; \
+ fi
endif
.PHONY: $(1)/distclean
diff --git a/deps/update.sh b/deps/update.sh
index 8099ed7..4a52279 100755
--- a/deps/update.sh
+++ b/deps/update.sh
@@ -1,6 +1,12 @@
#!/bin/sh -e
DIR="$1"
COMMIT="$2"
+URL_PREFIX="$3"
+
+if ! [ -d "$DIR" ]; then
+ echo "[$DIR] Initial git clone"
+ git clone -q "$URL_PREFIX"/"$DIR"
+fi
cd "$DIR"
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43167?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I7c1647edd11afac657acaf6add08903373eae585
Gerrit-Change-Number: 43167
Gerrit-PatchSet: 1
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>
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43169?usp=email )
Change subject: deps: avoid redirect with eclipse gitlab
......................................................................
deps: avoid redirect with eclipse gitlab
Use ".git" at the end of gitlab URLs to avoid the redirects, e.g.:
warning: redirecting to https://gitlab.eclipse.org/eclipse/titan/titan.ProtocolModules.M3UA.git/
This is not just a cosmetic improvement that gets rid of these warnings,
but it actually has the effect that we make less requests to the gitlab
eclipse server and are less likely to trigger the rate limiting. On my
machine I do trigger it with "make deps" without this patch, and with
this patch I don't.
Change-Id: I4cfb625e0d09e2bbcab2eef89b521f94c9b6c42c
---
M deps/update.sh
1 file changed, 13 insertions(+), 2 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/deps/update.sh b/deps/update.sh
index 332ce23..64c5b54 100755
--- a/deps/update.sh
+++ b/deps/update.sh
@@ -3,9 +3,20 @@
COMMIT="$2"
URL_PREFIX="$3"
+get_full_url() {
+ case "$URL_PREFIX" in
+ *gitlab*)
+ echo "$URL_PREFIX"/"$DIR".git
+ ;;
+ *)
+ echo "$URL_PREFIX"/"$DIR"
+ ;;
+ esac
+}
+
update_url() {
local current="$(git -C "$DIR" remote get-url origin)"
- local full_url="$URL_PREFIX"/"$DIR"
+ local full_url="$(get_full_url)"
if [ "$current" != "$full_url" ]; then
echo "[$DIR] Updating URL to $full_url"
@@ -18,7 +29,7 @@
update_url
else
echo "[$DIR] Initial git clone"
- git clone -q "$URL_PREFIX"/"$DIR"
+ git clone -q "$(get_full_url)"
fi
cd "$DIR"
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43169?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I4cfb625e0d09e2bbcab2eef89b521f94c9b6c42c
Gerrit-Change-Number: 43169
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>
laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/43124?usp=email )
Change subject: firmware: iso7816_3: fix F/D ratio for Di 8 and 9
......................................................................
firmware: iso7816_3: fix F/D ratio for Di 8 and 9
iso7816_3_compute_fd_ratio() multiplied F by D for every d_index >= 8,
presumably because the upper half of ISO 7816-3 Table 8 encodes 1/D.
But 7816-3 2006 and 1997 differ!
That assumption is only true for the range 1010..1111, which in the
2006 version is RFU. Indices 1000 and 1001 are Di = 12 and Di = 20,
see iso7816_3_di_table[].
So right now Fi=372/Di=12 -> 372 * 12 = 4464 instead of 372 / 12 =
31.
In the cemu value is rejected in emu_update_fidi()
and the old baud rate is silently kept.
In the sniffer update_fidi() programs US_FIDI as
4464 & 0x7ff = 368, which is garbage.
Use F/D for indices 1..9 and keep the legacy 1/D reading only for the RFU
range, where we cant really do anything useful anyway.
Change-Id: I44d6451d8b04aea2b0db7291b06a812afe84e52f
---
M firmware/libcommon/source/iso7816_fidi.c
1 file changed, 7 insertions(+), 3 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
lynxis lazus: Looks good to me, approved
diff --git a/firmware/libcommon/source/iso7816_fidi.c b/firmware/libcommon/source/iso7816_fidi.c
index 024663b..4e87dbd 100644
--- a/firmware/libcommon/source/iso7816_fidi.c
+++ b/firmware/libcommon/source/iso7816_fidi.c
@@ -48,9 +48,13 @@
if (d == 0)
return -EINVAL;
- /* See table 7 of ISO 7816-3: From 1000 on we divide by 1/d,
- * which equals a multiplication by d */
- if (d_index < 8)
+ /* DI defined in Table 8 of ISO/IEC 7816-3:2006
+ * has values 0001..1001 as div 1, 2, 4, 8, 16, 32, 64, 12, 20
+ * so indices 1..9 are all divisors and the ratio is F/D.
+ * But Indices 1010..1111 are RFU in the 2006 edition!
+ * 1997 used those for 1/2 .. 1/64, where dividing by 1/d equals multiplying by d.
+ * Keep that legacy interpretation for the RFU range only. */
+ if (d_index < 10)
ret = f / d;
else
ret = f * d;
--
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/43124?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-Change-Id: I44d6451d8b04aea2b0db7291b06a812afe84e52f
Gerrit-Change-Number: 43124
Gerrit-PatchSet: 1
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Attention is currently required from: Hoernchen.
laforge has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/simtrace2/+/43125?usp=email )
Change subject: firmware: use the full 11 bit US_FIDI.FI_DI_RATIO
......................................................................
Patch Set 1:
(2 comments)
Patchset:
PS1:
I tend to agree with the minor improvement requests by lynxis. Would be great if @Hoernchen can review + update.
File firmware/libcommon/source/simtrace_iso7816.c:
https://gerrit.osmocom.org/c/simtrace2/+/43125/comment/474e1abc_5d5259e8?us… :
PS1, Line 130: if (ratio > 0 && ratio <= US_FIDI_FI_DI_RATIO_Msk) {
> It is correct, but because this is a define from ./libchip_sam3s/include/SAM3S. […]
Acknowledged
--
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/43125?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-Change-Id: I6211dd5be7c5c5d2150af2aa37a403b33e6d340d
Gerrit-Change-Number: 43125
Gerrit-PatchSet: 1
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 05 Aug 2026 18:08:49 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>
Attention is currently required from: jolly, pespin.
laforge has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42817?usp=email )
Change subject: Add VTY test for "listen" node of osmo-stp VTY config
......................................................................
Patch Set 4:
(3 comments)
File tests/vty/osmo_stp_test.vty:
https://gerrit.osmocom.org/c/libosmo-sigtran/+/42817/comment/c7ac542e_69ece… :
PS2, Line 393: help
: list [with-flags]
: show vty-attributes
: show vty-attributes (application|library|global)
: write terminal
: write file [PATH]
: write memory
: write
: show running-config
: exit
: end
> see below
Done
https://gerrit.osmocom.org/c/libosmo-sigtran/+/42817/comment/bf078c99_12525… :
PS2, Line 415: help Description of the interactive help system
: list Print command list
: show Show running system information
: write Write running configuration to memory, network, or terminal
: exit Exit current mode and down to previous mode
: end End current mode and change to enable mode.
> those commands do not originate in libosmo-sigtran, do they? If libosmocore were to change the help […]
Done
https://gerrit.osmocom.org/c/libosmo-sigtran/+/42817/comment/c407ecb9_c1482… :
PS2, Line 431: init-ip-dscp Specify IP DSCP of Listener
> like here...
Done
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42817?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: Ia1ceb5f0374f47ff269b557be30fc4d59550d1a6
Gerrit-Change-Number: 42817
Gerrit-PatchSet: 4
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 05 Aug 2026 18:05:26 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>