Attention is currently required from: osmith.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30515 )
Change subject: obs: build_deb/rpm: show contents after build
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30515
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ie30b07f35f7e41990fa352523427d86458291d4d
Gerrit-Change-Number: 30515
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 08 Dec 2022 15:40:52 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30515 )
Change subject: obs: build_deb/rpm: show contents after build
......................................................................
Patch Set 1:
(1 comment)
File scripts/obs/data/build_deb.sh:
https://gerrit.osmocom.org/c/osmo-ci/+/30515/comment/75db7614_b438e4c0
PS1, Line 19: dpkg
> I would also do 'echo $i' before listing the contents. […]
This script runs with set -x, so the filename is printed before the command runs.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30515
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ie30b07f35f7e41990fa352523427d86458291d4d
Gerrit-Change-Number: 30515
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 08 Dec 2022 15:38:11 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/30519 )
Change subject: packaging: osmo-remsim-apitool needs py3-requests
......................................................................
packaging: osmo-remsim-apitool needs py3-requests
Related: OS#5817
Change-Id: I3b8f86b03aee145e0b0faf0394ab641666710bea
---
M contrib/osmo-remsim.spec.in
M debian/control
2 files changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/19/30519/1
diff --git a/contrib/osmo-remsim.spec.in b/contrib/osmo-remsim.spec.in
index 0245577..7c67b12 100644
--- a/contrib/osmo-remsim.spec.in
+++ b/contrib/osmo-remsim.spec.in
@@ -100,6 +100,7 @@
License: GPL-2.0-or-later
Group: Productivity/Telephony/Servers
Requires: python3
+Requires: python3-requests
%description -n osmo-remsim-apitool
This is a small python tool for generating API requests to remsim-server,
diff --git a/debian/control b/debian/control
index a9e2e56..6f424b9 100644
--- a/debian/control
+++ b/debian/control
@@ -54,7 +54,7 @@
Package: osmo-remsim-apitool
Architecture: any
Multi-Arch: same
-Depends: ${misc:Depends}, python3
+Depends: ${misc:Depends}, python3, python3-requests
Description: Osmocom Remote SIM - API tool for server
This is a small python tool for generating API requests to remsim-server,
which can be used by the system administrator to introspect and/or modify
--
To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/30519
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-remsim
Gerrit-Branch: master
Gerrit-Change-Id: I3b8f86b03aee145e0b0faf0394ab641666710bea
Gerrit-Change-Number: 30519
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-sgsn/+/30518 )
Change subject: osmo-gtphub.cfg: fix conflict with osmo-ggsn.cfg
......................................................................
osmo-gtphub.cfg: fix conflict with osmo-ggsn.cfg
Change bind-to-ggsns from 127.0.0.2 to 127.0.0.20, so osmo-gtphub's
default config does not confligt with the osmo-ggsn default config. This
change is for the effort of making the configs of all Osmocom programs
not conflict with each other.
A similar change was made in Id892e1f4ab2daabbe9824b819b5fed985373b97a
with bind-to-sgsns.
Related: OS#5817
Change-Id: I57ee457b62139d831707b6ebd6baaea8d33c2d9c
---
M doc/examples/osmo-gtphub/osmo-gtphub.cfg
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/18/30518/1
diff --git a/doc/examples/osmo-gtphub/osmo-gtphub.cfg b/doc/examples/osmo-gtphub/osmo-gtphub.cfg
index 0bb63e3..652d97d 100644
--- a/doc/examples/osmo-gtphub/osmo-gtphub.cfg
+++ b/doc/examples/osmo-gtphub/osmo-gtphub.cfg
@@ -9,7 +9,7 @@
! Local addresses to listen on and send from, each on standard ports
! 2123 and 2152. Setting these addresses is mandatory.
bind-to-sgsns 127.0.0.10
- bind-to-ggsns 127.0.0.2
+ bind-to-ggsns 127.0.0.20
! Local nonstandard ports or separate IPs:
!bind-to-sgsns ctrl 127.0.0.1 2342 user 127.0.0.1 4223
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30518
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I57ee457b62139d831707b6ebd6baaea8d33c2d9c
Gerrit-Change-Number: 30518
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: osmith.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/30516 )
Change subject: doc/examples: only install osmo-e1d.cfg to /etc
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/30516
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: Ic449b7d38ed50add0164f056574d4da47530eb49
Gerrit-Change-Number: 30516
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 08 Dec 2022 15:21:06 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: osmith.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30515 )
Change subject: obs: build_deb/rpm: show contents after build
......................................................................
Patch Set 1: Code-Review+1
(1 comment)
File scripts/obs/data/build_deb.sh:
https://gerrit.osmocom.org/c/osmo-ci/+/30515/comment/f8428b31_75729f22
PS1, Line 19: dpkg
I would also do 'echo $i' before listing the contents. Maybe this is done by dpkg itself?
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30515
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ie30b07f35f7e41990fa352523427d86458291d4d
Gerrit-Change-Number: 30515
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 08 Dec 2022 15:20:09 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/30516 )
Change subject: doc/examples: only install osmo-e1d.cfg to /etc
......................................................................
doc/examples: only install osmo-e1d.cfg to /etc
Adjust OSMOCONF_FILES, so only osmo-e1d.cfg of the examples gets
installed to /etc/osmocom/. All other examples still get installed to
/usr/share, as it is intended.
Related: OS#5817
Change-Id: Ic449b7d38ed50add0164f056574d4da47530eb49
---
M doc/examples/Makefile.am
1 file changed, 0 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/16/30516/1
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 2e070c2..b45a916 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -1,8 +1,5 @@
OSMOCONF_FILES = \
osmo-e1d.cfg \
- osmo-e1d-vpair.cfg \
- osmo-e1d-octoi-client.cfg \
- osmo-e1d-octoi-server.cfg \
$(NULL)
osmoconfdir = $(sysconfdir)/osmocom
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/30516
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: Ic449b7d38ed50add0164f056574d4da47530eb49
Gerrit-Change-Number: 30516
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/+/30515 )
Change subject: obs: build_deb/rpm: show contents after build
......................................................................
obs: build_deb/rpm: show contents after build
After building packages with the OBS scripts, show their contents. This
allows easy checking if config files were correctly packaged etc. By
adding it here, it will also show up at the end of the related jenkins
jobs for gerrit verifications.
Related: OS#5817
Change-Id: Ie30b07f35f7e41990fa352523427d86458291d4d
---
M scripts/obs/data/build_deb.sh
M scripts/obs/data/build_rpm.sh
2 files changed, 12 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/15/30515/1
diff --git a/scripts/obs/data/build_deb.sh b/scripts/obs/data/build_deb.sh
index 0030278..11eb36f 100755
--- a/scripts/obs/data/build_deb.sh
+++ b/scripts/obs/data/build_deb.sh
@@ -12,3 +12,9 @@
$apt_get update
$apt_get build-dep .
su "$BUILDUSER" -c "dpkg-buildpackage -us -uc -j$JOBS"
+
+# Show contents
+cd ..
+for i in *.deb; do
+ dpkg -c "$i"
+done
diff --git a/scripts/obs/data/build_rpm.sh b/scripts/obs/data/build_rpm.sh
index 3ade17e..77efef2 100755
--- a/scripts/obs/data/build_rpm.sh
+++ b/scripts/obs/data/build_rpm.sh
@@ -29,3 +29,9 @@
if [ -n "$INSIDE_DOCKER" ]; then
su "$BUILDUSER" -c "mv ~/rpmbuild/RPMS/*/*.rpm _temp/binpkgs/"
fi
+
+# Show contents
+cd _temp/binpkgs
+for i in *.rpm; do
+ rpm -qlp "$i"
+done
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30515
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ie30b07f35f7e41990fa352523427d86458291d4d
Gerrit-Change-Number: 30515
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange