osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/36936?usp=email )
Change subject: scripts/osmotestconfig: rmtree: no ignore_errors
......................................................................
scripts/osmotestconfig: rmtree: no ignore_errors
Do not ignore errors with shutil.rmtree(). The script expects to be able
to delete the directory, otherwise it will fail later on. So this hides
the original error and leads to a more confusing error later on.
Change-Id: I41616bb27af0d8b7da124ef309cd4a6e53be6597
---
M scripts/osmotestconfig.py
1 file changed, 15 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/36/36936/1
diff --git a/scripts/osmotestconfig.py b/scripts/osmotestconfig.py
index 8840741..6580fc7 100755
--- a/scripts/osmotestconfig.py
+++ b/scripts/osmotestconfig.py
@@ -68,7 +68,8 @@
return ret
def copy_config(dirname, config):
- shutil.rmtree(dirname, True)
+ if os.path.exists(dirname):
+ shutil.rmtree(dirname)
ign = shutil.ignore_patterns('*.cfg')
shutil.copytree(os.path.dirname(config), dirname, ignore=ign)
os.chmod(dirname, stat.S_IRWXU)
--
To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/36936?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: python/osmo-python-tests
Gerrit-Branch: master
Gerrit-Change-Id: I41616bb27af0d8b7da124ef309cd4a6e53be6597
Gerrit-Change-Number: 36936
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: fixeria, laforge, osmith, pespin.
Hello Jenkins Builder, fixeria, laforge, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-sgsn/+/36845?usp=email
to look at the new patch set (#6).
The following approvals got outdated and were removed:
Code-Review+1 by laforge, Code-Review+1 by pespin, Verified+1 by Jenkins Builder
Change subject: doc: set state-dir to /var/lib/osmocom/osmo-sgsn
......................................................................
doc: set state-dir to /var/lib/osmocom/osmo-sgsn
Be consistent with osmo-ggsn, and set the state dir to
/var/lib/osmocom/osmo-sgsn. Without this patch, it defaults to the
current directory, which means in case of running with the systemd
service, /var/lib/osmocom.
Copy osmo-sgsn.cfg and osmo-sgsn-accept-all.cfg to the tests dir and do
not set the state-dir there. Usually the user that runs the VTY and CTRL
tests is not allowed to write to /var/lib/osmocom. (I've also tried
generating these on the fly, but that breaks in 'make distcheck', as I
would need to write to the source dir or would need to change
osmo-python-tests etc. to read the config file from another directory.)
Related: osmo-ggsn I5b51529b4f8bd2462e54f58a1ce2e2d7c76ff46a
Depends: osmo-python-tests Ic312d546da1c21f68a80b6a188616ef9bc84f4c6
Change-Id: I309807ff0bc125d4653222b2b4ba69ded3bbff70
---
M doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg
M doc/examples/osmo-sgsn/osmo-sgsn.cfg
M doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg
M osmoappdesc.py
M tests/Makefile.am
M tests/ctrl_test_runner.py
A tests/osmo-sgsn-accept-all.cfg
A tests/osmo-sgsn.cfg
M tests/vty_test_runner.py
9 files changed, 111 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/45/36845/6
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36845?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I309807ff0bc125d4653222b2b4ba69ded3bbff70
Gerrit-Change-Number: 36845
Gerrit-PatchSet: 6
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: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libsmpp34/+/36933?usp=email )
Change subject: Bump version: 1.14.3.3-16b4-dirty → 1.14.4
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
GCC was upgraded in Debian Unstable, the latest release fails to build now:
```
[ 171s] ../test_apps/esme.h:32:16: error: implicit declaration of function 'strtol'; did you mean 'strtok'? [-Werror=implicit-function-declaration]
```
https://obs.osmocom.org/package/live_build_log/osmocom:latest/libsmpp34/Deb…
Vadim already patched it on master. Tag a patch release to get the fix into the latest release.
--
To view, visit https://gerrit.osmocom.org/c/libsmpp34/+/36933?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libsmpp34
Gerrit-Branch: master
Gerrit-Change-Id: I3e0c3c2bab1c55ceb828d8066bd49bc8624e21f7
Gerrit-Change-Number: 36933
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Comment-Date: Mon, 27 May 2024 09:20:05 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/36932?usp=email )
Change subject: OBS: add update_obs_eclipse_titan.sh
......................................................................
OBS: add update_obs_eclipse_titan.sh
Add a script to easily update the eclipse-titan package from a git
repository. This replaces the previous workflow of downloading the
previous source package, modifying it, and re-uploading it. With the git
repository, it is easier to see which patches are included, and it is
easier to modify the packaging (e.g. add new patches to fix build with
latest gcc), and easier to upgrade the eclipse-titan version.
I've done this change because it failed to build with the most recent
GCC in Debian Unstable. Backporting Vadim's patch from upstream fixes
it.
Related: https://gitlab.eclipse.org/eclipse/titan/titan.core/-/commit/b5d3d5bf4f0e2c…
Related: https://osmocom.org/projects/cellular-infrastructure/wiki/Upgrading_eclipse…
Change-Id: Ieb1945d5cf4abf8ae2201f49ea7dce8eb343167e
---
A scripts/obs/update_obs_eclipse_titan.sh
1 file changed, 62 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/32/36932/1
diff --git a/scripts/obs/update_obs_eclipse_titan.sh b/scripts/obs/update_obs_eclipse_titan.sh
new file mode 100755
index 0000000..6efb7c6
--- /dev/null
+++ b/scripts/obs/update_obs_eclipse_titan.sh
@@ -0,0 +1,40 @@
+#!/bin/sh -e
+# https://osmocom.org/projects/cellular-infrastructure/wiki/Upgrading_eclipse…
+DIR="$(realpath "$(dirname "$0")")"
+PROJ="$1"
+GIT_URL="https://gitea.osmocom.org/osmith/titan.core"
+CHECKOUT="osmocom/9.0.0"
+
+prepare_git_repo() {
+ cd "$DIR"
+ if ! [ -d _cache/eclipse-titan ]; then
+ mkdir -p _cache
+ git -C _cache clone "$GIT_URL" eclipse-titan
+ fi
+
+ cd _cache/eclipse-titan
+ git fetch
+ git clean -fdx
+ git checkout -f -B "$CHECKOUT"
+ git reset --hard origin/"$CHECKOUT"
+}
+
+update_obs_project() {
+ cd "$DIR"
+ ./update_obs_project.py \
+ --apiurl https://obs.osmocom.org \
+ --docker \
+ --allow-unknown-package \
+ --git-skip-checkout \
+ --git-skip-fetch \
+ --version-append "~osmocom" \
+ "$PROJ" \
+ eclipse-titan
+}
+
+set -x
+prepare_git_repo
+
+if [ -n "$PROJ" ]; then
+ update_obs_project
+fi
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36932?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ieb1945d5cf4abf8ae2201f49ea7dce8eb343167e
Gerrit-Change-Number: 36932
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
