fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42349?usp=email )
Change subject: s1gw: remove unused mp_s1gw_mme_ip
......................................................................
s1gw: remove unused mp_s1gw_mme_ip
We don't really care what address the S1GW is using when connecting
to our virtual MME. This is why this parameter is not used anywhere.
Change-Id: I4fff3954c005ac3df34d00c3b0312300ba4f49a1
---
M s1gw/S1GW_Tests.cfg
M s1gw/S1GW_Tests.ttcn
2 files changed, 0 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/49/42349/1
diff --git a/s1gw/S1GW_Tests.cfg b/s1gw/S1GW_Tests.cfg
index 69e893f..8174b9e 100644
--- a/s1gw/S1GW_Tests.cfg
+++ b/s1gw/S1GW_Tests.cfg
@@ -13,7 +13,6 @@
[MODULE_PARAMETERS]
S1GW_Tests.mp_s1gw_enb_ip := "127.0.1.1";
S1GW_Tests.mp_enb_bind_ip := "127.0.1.10";
-S1GW_Tests.mp_s1gw_mme_ip := "127.0.2.1";
S1GW_Tests.mp_mme_bind_ip := "127.0.2.10";
S1GW_Tests.mp_s1gw_upf_ip := "127.0.3.1";
S1GW_Tests.mp_upf_bind_ip := "127.0.3.10";
diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn
index 43cbe74..ff4734d 100644
--- a/s1gw/S1GW_Tests.ttcn
+++ b/s1gw/S1GW_Tests.ttcn
@@ -54,7 +54,6 @@
modulepar {
charstring mp_s1gw_enb_ip := "127.0.1.1"; /* eNB facing address of the S1GW */
charstring mp_enb_bind_ip := "127.0.1.10"; /* eNB address to use locally when connecting to S1GW */
- charstring mp_s1gw_mme_ip := "127.0.2.1"; /* MME facing address of the S1GW */
charstring mp_mme_bind_ip := "127.0.2.10"; /* MME address on which we get connections from S1GW */
charstring mp_s1gw_upf_ip := "127.0.3.1"; /* UPF facing address of the S1GW */
charstring mp_upf_bind_ip := "127.0.3.10"; /* UPF address on which we get connections from S1GW */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42349?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I4fff3954c005ac3df34d00c3b0312300ba4f49a1
Gerrit-Change-Number: 42349
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42350?usp=email )
Change subject: s1gw: make S1AP_Server.f_conn_add() return nothing
......................................................................
s1gw: make S1AP_Server.f_conn_add() return nothing
The index of a new entry is not used anywhere, so do not return it.
Change-Id: I8df3985a665ae919849559ea8cf0fd33b5b22df8
---
M s1gw/S1AP_Server.ttcn
1 file changed, 2 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/50/42350/1
diff --git a/s1gw/S1AP_Server.ttcn b/s1gw/S1AP_Server.ttcn
index 5bd83a4..df91eaa 100644
--- a/s1gw/S1AP_Server.ttcn
+++ b/s1gw/S1AP_Server.ttcn
@@ -128,9 +128,9 @@
return -1;
}
-/* add a new connection, return its index */
+/* add a new connection */
private function f_conn_add(ConnectionId conn_id)
-runs on S1AP_Server_CT return integer {
+runs on S1AP_Server_CT {
var ConnData conn := { conn_id, - };
var integer idx;
@@ -139,11 +139,8 @@
mtc.stop;
}
- idx := lengthof(g_conn_list);
g_conn_list := g_conn_list & { conn };
log("Connection (id=", conn_id, ") is registered");
-
- return idx;
}
/* del an existing connection */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42350?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I8df3985a665ae919849559ea8cf0fd33b5b22df8
Gerrit-Change-Number: 42350
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42342?usp=email )
Change subject: s1gw: fix TC_e_rab_setup_failure: expect a specific S1AP PDU
......................................................................
s1gw: fix TC_e_rab_setup_failure: expect a specific S1AP PDU
setup_rsp is carefully constructed, but is not actually used.
The f_ConnHdlr_rx_s1ap_from_enb() call falls through to the ? default,
so the test accepts any S1AP PDU and never validates that the S1GW
actually populated the failed-items list correctly.
Change-Id: I6dbe272af4302c83ac26db9b7da5a7f7bc96daa7
Fixes: 47544443 ("s1gw: add TC_e_rab_setup_failure")
---
M s1gw/S1GW_Tests.ttcn
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/42/42342/1
diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn
index 6623b1f..43cbe74 100644
--- a/s1gw/S1GW_Tests.ttcn
+++ b/s1gw/S1GW_Tests.ttcn
@@ -507,7 +507,7 @@
setup_rsp := tr_S1AP_RABSetupRsp(g_pars.mme_ue_id, g_pars.idx,
rab_setup_items := omit,
rab_failed_items := tr_E_RABList(item));
- f_ConnHdlr_rx_s1ap_from_enb(s1ap_pdu);
+ f_ConnHdlr_rx_s1ap_from_enb(s1ap_pdu, setup_rsp);
f_ConnHdlr_s1ap_disconnect();
f_ConnHdlr_s1ap_unregister(g_pars.genb_id);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42342?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I6dbe272af4302c83ac26db9b7da5a7f7bc96daa7
Gerrit-Change-Number: 42342
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/42325?usp=email )
Change subject: ansible/hosts: update lx2-1-obs-aarch64-1 ip
......................................................................
ansible/hosts: update lx2-1-obs-aarch64-1 ip
This machine is not available under the listed IPv6 anymore, but can be
reached through the VPN. Adjust the IP.
Change-Id: I77f72d7ad72d9b3ac745756cc5a082bd39dabdc5
---
M ansible/hosts
M ansible/util/known_hosts
2 files changed, 2 insertions(+), 1 deletion(-)
Approvals:
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/ansible/hosts b/ansible/hosts
index 4cd6242..f2390af 100644
--- a/ansible/hosts
+++ b/ansible/hosts
@@ -25,7 +25,7 @@
[obs_workers]
build4-obsworker ansible_host=2a01:4f8:121:200a::1:2 obs_worker_instances=8 obs_worker_jobs=8
build5-obsworker ansible_host=2a01:4f8:140:926a::1:2 obs_worker_instances=8 obs_worker_jobs=8
-lx2-1-obs-aarch64-1 ansible_host=2a02:8106:13:1e34:4e9:e7ff:fe97:fe92 obs_worker_instances=1 obs_worker_jobs=4
+lx2-1-obs-aarch64-1 ansible_host=10.9.25.26 obs_worker_instances=1 obs_worker_jobs=4
# Need to have kvm inside lxc, see OS#5365. Make sure to disconnect and
# reconnect the jenkins agent after running this playbook, so its login session
diff --git a/ansible/util/known_hosts b/ansible/util/known_hosts
index 51d03ea..b7236d0 100644
--- a/ansible/util/known_hosts
+++ b/ansible/util/known_hosts
@@ -12,3 +12,4 @@
2a01:4f8:140:926a::1:2 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQvi5s82dH4Duhp2YV4mo71+i3J6bybD/Ph/ibysdGE
build5.osmocom.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJafKRvWKA+B+cEz20YlWO+5XrWY+t4tacLAfm5DMMal
build4.osmocom.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHdLymAofmutYuXMgiWQaNiFUHfu+2j60pmWemd5hddw
+10.9.25.26 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICHw8f7STEM6tZj/14dMG0aPcOLzpC0uSwoOlwAMv7Z3
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/42325?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I77f72d7ad72d9b3ac745756cc5a082bd39dabdc5
Gerrit-Change-Number: 42325
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
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-ci/+/42324?usp=email )
Change subject: ansible: osmocom-obs-worker: add mount-securityfs.service
......................................................................
ansible: osmocom-obs-worker: add mount-securityfs.service
Fix errors in lxc-start related to not having securityfs available:
[ 14s] booting lxc...
[ 14s] lxc-start: obsbuild:root_6: lsm/apparmor.c: apparmor_prepare: 1132 If you really want to start this container, set
[ 14s] lxc-start: obsbuild:root_6: lsm/apparmor.c: apparmor_prepare: 1133 lxc.apparmor.allow_incomplete = 1
[ 14s] lxc-start: obsbuild:root_6: lsm/apparmor.c: apparmor_prepare: 1134 in your container configuration file
[ 14s] lxc-start: obsbuild:root_6: start.c: lxc_init: 879 Failed to initialize LSM
[ 14s] lxc-start: obsbuild:root_6: start.c: __lxc_start: 2008 Failed to initialize container "obsbuild:root_6"
[ 14s] lxc-start: obsbuild:root_6: tools/lxc_start.c: main: 306 The container failed to start
[ 14s] lxc-start: obsbuild:root_6: tools/lxc_start.c: main: 312 Additional information can be obtained by setting the --logfile and --logpriority options
[ 14s] '/var/cache/obs/worker/root_6/.build/_exitcode' not found or symlink
Usually systemd would mount the securityfs automatically as I understand
it, but it doesn't work anymore without this service in our use case
where osmocom-obs-worker runs inside an LXC itself. This is probably
related to upgrading the opensuse version for the osmocom-obs-worker
containers.
Change-Id: I0c708815440c67340531548361deb326c864aefe
---
A ansible/roles/osmocom-obs-worker/files/mount-securityfs.service
M ansible/roles/osmocom-obs-worker/tasks/obs.yml
2 files changed, 24 insertions(+), 0 deletions(-)
Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
diff --git a/ansible/roles/osmocom-obs-worker/files/mount-securityfs.service b/ansible/roles/osmocom-obs-worker/files/mount-securityfs.service
new file mode 100644
index 0000000..4066aa9
--- /dev/null
+++ b/ansible/roles/osmocom-obs-worker/files/mount-securityfs.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Mount securityfs
+Before=obsworker.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/mount securityfs /sys/kernel/security -t securityfs
+ExecStop=/usr/bin/umount /sys/kernel/security
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/ansible/roles/osmocom-obs-worker/tasks/obs.yml b/ansible/roles/osmocom-obs-worker/tasks/obs.yml
index a0a6227..48024ec 100644
--- a/ansible/roles/osmocom-obs-worker/tasks/obs.yml
+++ b/ansible/roles/osmocom-obs-worker/tasks/obs.yml
@@ -46,6 +46,18 @@
name:
- qemu-arm
+- name: install mount-securityfs.service
+ ansible.builtin.copy:
+ src: mount-securityfs.service
+ dest: /etc/systemd/system/mount-securityfs.service
+
+- name: start and enable the mount-securityfs service
+ systemd:
+ daemon_reload: true
+ state: started
+ name: mount-securityfs.service
+ enabled: yes
+
- name: ensure the systemd service is installed
systemd:
name: obsworker.service
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/42324?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I0c708815440c67340531548361deb326c864aefe
Gerrit-Change-Number: 42324
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42340?usp=email )
Change subject: 5gc: Document Location Services as not implemented by open5gs
......................................................................
5gc: Document Location Services as not implemented by open5gs
Change-Id: I784ecc13018456278d228120cb22b786be6532ac
---
M 5gc/C5G_Tests.ttcn
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/40/42340/1
diff --git a/5gc/C5G_Tests.ttcn b/5gc/C5G_Tests.ttcn
index e4b2898..815b800 100644
--- a/5gc/C5G_Tests.ttcn
+++ b/5gc/C5G_Tests.ttcn
@@ -968,7 +968,7 @@
* - 3GPP TS 23.502 4.13.3.6 MT SMS over NAS in CM-IDLE state and RRC_INACTIVE with CN based MT communication state via 3GPP access: Not supported by open5gs (https://github.com/open5gs/open5gs/issues/4362)
* - 3GPP TS 23.502 4.13.3.7 MT SMS over NAS in CM-CONNECTED state via 3GPP access: Not supported by open5gs (https://github.com/open5gs/open5gs/issues/4362)
* - 3GPP TS 23.502 4.13.3.8 MT SMS over NAS via non-3GPP access: Not supported by open5gs (https://github.com/open5gs/open5gs/issues/4362)
- * - 3GPP TS 23.502 4.13.5 Location Services procedures
+ * - 3GPP TS 23.502 4.13.5 Location Services procedures: Not supported by open5gs (https://github.com/open5gs/open5gs/issues/4364)
* - 3GPP TS 23.502 4.13.6.1 EPS fallback for IMS voice
* - 3GPP TS 23.502 4.13.6.2 Inter RAT Fallback in 5GC for IMS voice
* - 3GPP TS 23.502 4.13.6.3 Transfer of PDU session used for IMS voice from non-3GPP access to 5GS
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42340?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I784ecc13018456278d228120cb22b786be6532ac
Gerrit-Change-Number: 42340
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>