neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29164 )
Change subject: packate the new osmo-hnbgw-pfcp.cfg example config file
......................................................................
packate the new osmo-hnbgw-pfcp.cfg example config file
In I62c4935bcc7f684bfe850f88f1b80e8970e0e098 we added a new example
config file, but didn't actually package it in dpkg or rpm packages
yet. This also lead to package build failures like:
[ 39s] RPM build errors:
[ 39s] Installed (but unpackaged) file(s) found:
[ 39s] /usr/share/doc/osmo-hnbgw/examples/osmo-hnbgw/osmo-hnbgw-pfcp.cfg
Change-Id: I7c5c346f67f003b2cc5d74e812441c3704b133ef
---
M debian/osmo-hnbgw.install
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
neels: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/debian/osmo-hnbgw.install b/debian/osmo-hnbgw.install
index ac1f931..daf1f1a 100644
--- a/debian/osmo-hnbgw.install
+++ b/debian/osmo-hnbgw.install
@@ -2,3 +2,4 @@
lib/systemd/system/osmo-hnbgw.service
usr/bin/osmo-hnbgw
usr/share/doc/osmo-hnbgw/examples/osmo-hnbgw/osmo-hnbgw.cfg usr/share/doc/osmo-hnbgw/examples
+usr/share/doc/osmo-hnbgw/examples/osmo-hnbgw/osmo-hnbgw-pfcp.cfg usr/share/doc/osmo-hnbgw/examples
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29164
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I7c5c346f67f003b2cc5d74e812441c3704b133ef
Gerrit-Change-Number: 29164
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: laforge.
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29164 )
Change subject: packate the new osmo-hnbgw-pfcp.cfg example config file
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29164
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I7c5c346f67f003b2cc5d74e812441c3704b133ef
Gerrit-Change-Number: 29164
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Fri, 26 Aug 2022 11:53:30 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29214 )
Change subject: repo-install-test: fix nftables errors on centos8
......................................................................
repo-install-test: fix nftables errors on centos8
Don't attempt to install nftables-devel or python3-nftables in centos8
in the repo-install-test. What happens is, that dnf tries to install the
versions from the centos repositories, which conflict with the ones from
the OBS repositories. This fixes the failing
Osmocom-repo-install-centos8 jenkins job.
Change-Id: I57670069cc09a5493667971997f0245e1d6a7259
---
M scripts/repo-install-test/blacklist_centos8.txt
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
neels: Looks good to me, approved
diff --git a/scripts/repo-install-test/blacklist_centos8.txt b/scripts/repo-install-test/blacklist_centos8.txt
index 83d2cbd..3e5381d 100644
--- a/scripts/repo-install-test/blacklist_centos8.txt
+++ b/scripts/repo-install-test/blacklist_centos8.txt
@@ -9,3 +9,7 @@
# the dependency problem means that we can't simply install the package in
# centos. In OBS we work around this in the project config.
ulfius-devel
+
+# Also linked to opensuse versions
+nftables-devel
+python3-nftables
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29214
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I57670069cc09a5493667971997f0245e1d6a7259
Gerrit-Change-Number: 29214
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: merged
neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/29213 )
Change subject: osmo_pfcp_tool: fix osmo_pfcp_tool_copyright error
......................................................................
osmo_pfcp_tool: fix osmo_pfcp_tool_copyright error
Fix for building on opensuse 15.4 with GCC 7.5.0+r278197:
osmo_pfcp_tool_main.c:219:15: error: initializer element is not constant
.copyright = osmo_pfcp_tool_copyright,
The variable is only used once, so move its contents directly into the
struct vty_app_info, like it is done in osmo_upf_main.c.
Fixes: OS#5655
Change-Id: Iff273283a082bb6d07c4c98d421b17b54457abe1
---
M src/osmo-pfcp-tool/osmo_pfcp_tool_main.c
1 file changed, 6 insertions(+), 7 deletions(-)
Approvals:
Jenkins Builder: Verified
neels: Looks good to me, approved
diff --git a/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c b/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c
index 43c3b45..e950f7f 100644
--- a/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c
+++ b/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c
@@ -206,17 +206,16 @@
}
}
-static const char * const osmo_pfcp_tool_copyright =
- "OsmoPFCPTool - Osmocom Packet Forwarding Control Protocol tool for testing\r\n"
- "Copyright (C) 2021-2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de>\r\n"
- "License AGPLv3+: GNU AGPL version 3 or later <http://gnu.org/licenses/agpl-3.0.html>\r\n"
- "This is free software: you are free to change and redistribute it.\r\n"
- "There is NO WARRANTY, to the extent permitted by law.\r\n";
static struct vty_app_info pfcp_tool_vty_app_info = {
.name = "osmo-pfcp-tool",
.version = PACKAGE_VERSION,
- .copyright = osmo_pfcp_tool_copyright,
+ .copyright =
+ "OsmoPFCPTool - Osmocom Packet Forwarding Control Protocol tool for testing\r\n"
+ "Copyright (C) 2021-2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de>\r\n"
+ "License AGPLv3+: GNU AGPL version 3 or later <http://gnu.org/licenses/agpl-3.0.html>\r\n"
+ "This is free software: you are free to change and redistribute it.\r\n"
+ "There is NO WARRANTY, to the extent permitted by law.\r\n",
};
static const struct log_info_cat pfcp_tool_default_categories[] = {
--
To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/29213
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-upf
Gerrit-Branch: master
Gerrit-Change-Id: Iff273283a082bb6d07c4c98d421b17b54457abe1
Gerrit-Change-Number: 29213
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: merged
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/29214 )
Change subject: repo-install-test: fix nftables errors on centos8
......................................................................
repo-install-test: fix nftables errors on centos8
Don't attempt to install nftables-devel or python3-nftables in centos8
in the repo-install-test. What happens is, that dnf tries to install the
versions from the centos repositories, which conflict with the ones from
the OBS repositories. This fixes the failing
Osmocom-repo-install-centos8 jenkins job.
Change-Id: I57670069cc09a5493667971997f0245e1d6a7259
---
M scripts/repo-install-test/blacklist_centos8.txt
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/14/29214/1
diff --git a/scripts/repo-install-test/blacklist_centos8.txt b/scripts/repo-install-test/blacklist_centos8.txt
index 83d2cbd..3e5381d 100644
--- a/scripts/repo-install-test/blacklist_centos8.txt
+++ b/scripts/repo-install-test/blacklist_centos8.txt
@@ -9,3 +9,7 @@
# the dependency problem means that we can't simply install the package in
# centos. In OBS we work around this in the project config.
ulfius-devel
+
+# Also linked to opensuse versions
+nftables-devel
+python3-nftables
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29214
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I57670069cc09a5493667971997f0245e1d6a7259
Gerrit-Change-Number: 29214
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange