osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/29152 )
Change subject: obs: prepend origin/ to branch selected with -b
......................................................................
obs: prepend origin/ to branch selected with -b
Doing this makes more sense and is less prone to errors.
Change-Id: I2fa9c457e0e17cdd1b5946dc27ae232ec13bfa25
---
M scripts/obs/README
M scripts/obs/lib/srcpkg.py
2 files changed, 3 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/52/29152/1
diff --git a/scripts/obs/README b/scripts/obs/README
index d9499d8..67d2a2b 100644
--- a/scripts/obs/README
+++ b/scripts/obs/README
@@ -88,11 +88,9 @@
--------------------------------------
cd ~/osmo-dev/src/osmo-ci/scripts/obs/
- ./update_obs_project.py -b origin/neels/pkg home:nhofmeyr:test osmo-hnbgw
+ ./update_obs_project.py -b neels/pkg home:nhofmeyr:test osmo-hnbgw
-The -b option chooses a custom branch to build. It is important to prepend
-'origin/' to 'your/branch', so that repeated dev cycles use the latest branch
-tip that was fetched instead staying stuck on the local branch.
+The -b option chooses a custom branch to build.
See results
diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py
index 92c3aa7..baf64a9 100644
--- a/scripts/obs/lib/srcpkg.py
+++ b/scripts/obs/lib/srcpkg.py
@@ -10,7 +10,7 @@
def checkout_for_feed(project, feed, branch=None):
""" checkout a commit, either latest tag or master or 20YY branch """
if branch:
- lib.git.checkout(project, branch)
+ lib.git.checkout(project, f"origin/{branch}")
elif feed == "latest":
lib.git.checkout_latest_tag(project)
elif feed == "nightly":
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29152
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I2fa9c457e0e17cdd1b5946dc27ae232ec13bfa25
Gerrit-Change-Number: 29152
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/29150 )
Change subject: obs: checkout_for_feed + fetch: fix for 2022q1 etc
......................................................................
obs: checkout_for_feed + fetch: fix for 2022q1 etc
As Neels pointed out, with the current code the 2022q1 and similar feeds
do not get checked out properly if:
* the repository was not freshly cloned (like jenkins would do)
* the repository was fetched (--git-fetch)
Instead of the last revision of that branch from origin, we get the
revision that was previously checked out on the branch. Fix this by
prepending origin/.
Change-Id: I2e265fc84abd4596c386bb56cbabb2af121dc7ca
---
M scripts/obs/lib/srcpkg.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/50/29150/1
diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py
index ec29581..92c3aa7 100644
--- a/scripts/obs/lib/srcpkg.py
+++ b/scripts/obs/lib/srcpkg.py
@@ -16,7 +16,7 @@
elif feed == "nightly":
lib.git.checkout_default_branch(project)
else: # 2022q1 etc
- lib.git.checkout(project, feed)
+ lib.git.checkout(project, f"origin/{feed}")
def get_git_version_gen_path(project):
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29150
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I2e265fc84abd4596c386bb56cbabb2af121dc7ca
Gerrit-Change-Number: 29150
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/29151 )
Change subject: obs: make git fetch the default
......................................................................
obs: make git fetch the default
As discussed with Neels, it makes more sense to fetch git repos by
default.
Change-Id: Ib8adfbcf59d66b26f322ad22b2df1ccbeaf15af7
---
M jobs/osmocom-obs.yml
M scripts/obs/README
M scripts/obs/lib/__init__.py
3 files changed, 4 insertions(+), 9 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/51/29151/1
diff --git a/jobs/osmocom-obs.yml b/jobs/osmocom-obs.yml
index cb8cef1..06b4ecb 100644
--- a/jobs/osmocom-obs.yml
+++ b/jobs/osmocom-obs.yml
@@ -38,7 +38,6 @@
--conflict-version {conflict_version} \
--docker \
--feed {type} \
- --git-fetch \
--meta \
{proj}:{type}
scm:
diff --git a/scripts/obs/README b/scripts/obs/README
index 6d18f7d..d9499d8 100644
--- a/scripts/obs/README
+++ b/scripts/obs/README
@@ -88,11 +88,7 @@
--------------------------------------
cd ~/osmo-dev/src/osmo-ci/scripts/obs/
- ./update_obs_project.py -g -b origin/neels/pkg home:nhofmeyr:test osmo-hnbgw
-
-The -g option ensures that the latest branch tip is fetched from Osmocom's git.
-Without it, the cached git repository will stay stuck on its currently checked
-out branch version -- you will keep submitting the same state.
+ ./update_obs_project.py -b origin/neels/pkg home:nhofmeyr:test osmo-hnbgw
The -b option chooses a custom branch to build. It is important to prepend
'origin/' to 'your/branch', so that repeated dev cycles use the latest branch
diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py
index b490ae8..a07a072 100644
--- a/scripts/obs/lib/__init__.py
+++ b/scripts/obs/lib/__init__.py
@@ -27,9 +27,9 @@
parser.add_argument("-d", "--docker",
help="run in docker to avoid installing required pkgs",
action="store_true")
- parser.add_argument("-g", "--git-fetch",
- help="fetch already cloned git repositories",
- action="store_true")
+ parser.add_argument("-s", "--git-skip-fetch",
+ help="do not fetch already cloned git repositories",
+ action="store_false", dest="git_fetch")
parser.add_argument("-m", "--meta", action="store_true",
help="build a meta package (e.g. osmocom-nightly)")
parser.add_argument("-c", "--conflict-version", nargs="?",
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29151
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ib8adfbcf59d66b26f322ad22b2df1ccbeaf15af7
Gerrit-Change-Number: 29151
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/29149 )
Change subject: osmo-bts-trx: amr_loop: trigger the loop unconditionally
......................................................................
osmo-bts-trx: amr_loop: trigger the loop unconditionally
The logic responsible for enabling and disabling the loop appears
to be broken: during my experiments trx_loop_amr_set() was never
called with loop=1. It's not clear what's the motivation behind
this breaker, so I propose to rip it out for now. This patch
finally makes the loop work (confirmed with a TEMS phone).
Related: SYS#5917, OS#4984
Change-Id: I09b649973d4269c4082a4fafa493c37825f95a9c
(cherry picked from commit 541b7525aee81fbeed23be9cddf909ebcca6ed6d)
---
M include/osmo-bts/scheduler.h
M src/osmo-bts-trx/amr_loop.c
M src/osmo-bts-trx/sched_lchan_tchf.c
3 files changed, 1 insertion(+), 30 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/49/29149/1
diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h
index ec31eab..c96b70b 100644
--- a/include/osmo-bts/scheduler.h
+++ b/include/osmo-bts/scheduler.h
@@ -119,7 +119,6 @@
uint8_t dl_ft; /* current downlink FT index */
uint8_t ul_cmr; /* current uplink CMR index */
uint8_t dl_cmr; /* current downlink CMR index */
- uint8_t amr_loop; /* if AMR loop is enabled */
uint8_t amr_last_dtx; /* last received dtx frame type */
/* TCH/H */
diff --git a/src/osmo-bts-trx/amr_loop.c b/src/osmo-bts-trx/amr_loop.c
index ce89091..859f39b 100644
--- a/src/osmo-bts-trx/amr_loop.c
+++ b/src/osmo-bts-trx/amr_loop.c
@@ -40,10 +40,6 @@
const uint8_t mi = chan_state->ul_ft; /* mode index 0..3 */
int lqual_cb = meas_set->ci_cb; /* cB (centibel) */
- /* check if loop is enabled */
- if (!chan_state->amr_loop)
- return;
-
/* count per-block C/I samples for further averaging */
if (lchan->type == GSM_LCHAN_TCH_H) {
chan_state->lqual_cb_num += 2;
@@ -109,16 +105,3 @@
LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Keeping the current AMR codec "
"mode[%u]=%u\n", mi, cfg->mode[mi].mode);
}
-
-void trx_loop_amr_set(struct l1sched_chan_state *chan_state, int loop)
-{
- if (chan_state->amr_loop == loop)
- return;
- if (!chan_state->amr_loop) {
- /* reset the link quality measurements */
- chan_state->lqual_cb_num = 0;
- chan_state->lqual_cb_sum = 0;
- }
-
- chan_state->amr_loop = loop;
-}
diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c
index 6a90327..b530d25 100644
--- a/src/osmo-bts-trx/sched_lchan_tchf.c
+++ b/src/osmo-bts-trx/sched_lchan_tchf.c
@@ -384,7 +384,7 @@
if (msg_tch) {
int len;
uint8_t cmr_codec;
- int cmr, ft, i;
+ int ft, i;
enum osmo_amr_type ft_codec;
enum osmo_amr_quality bfi;
int8_t sti, cmi;
@@ -416,22 +416,11 @@
LOGL1SB(DL1P, LOGL_ERROR, l1ts, br, "Cannot send invalid AMR payload\n");
goto free_bad_msg;
}
- cmr = -1;
ft = -1;
for (i = 0; i < chan_state->codecs; i++) {
- if (chan_state->codec[i] == cmr_codec)
- cmr = i;
if (chan_state->codec[i] == ft_codec)
ft = i;
}
- if (cmr >= 0) { /* new request */
- chan_state->dl_cmr = cmr;
- /* disable AMR loop */
- trx_loop_amr_set(chan_state, 0);
- } else {
- /* enable AMR loop */
- trx_loop_amr_set(chan_state, 1);
- }
if (ft < 0) {
LOGL1SB(DL1P, LOGL_ERROR, l1ts, br,
"Codec (FT = %d) of RTP frame not in list\n", ft_codec);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29149
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: 2022q2
Gerrit-Change-Id: I09b649973d4269c4082a4fafa493c37825f95a9c
Gerrit-Change-Number: 29149
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange