daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27108 )
Change subject: RAN_Emulation: Don't decode L3 if g_ran_ops.decode_dtap == false
......................................................................
RAN_Emulation: Don't decode L3 if g_ran_ops.decode_dtap == false
We must respect this flag not only in "normal" PDUs but also
in the code path processing the "expect" handling.
Change-Id: I04a9197ac0b68c2dcb7542d035dc70c9f2b90473
---
M library/RAN_Emulation.ttcnpp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp
index 3158dc4..9873245 100644
--- a/library/RAN_Emulation.ttcnpp
+++ b/library/RAN_Emulation.ttcnpp
@@ -569,7 +569,7 @@
runs on RAN_Emulation_CT {
/* decode + send decoded RANAP to client */
var template (omit) octetstring l3 := f_ranap_extract_l3(ranap);
- if (istemplatekind(l3, "omit")) {
+ if (istemplatekind(l3, "omit") or not g_ran_ops.decode_dtap) {
CLIENT.send(ranap) to client;
} else {
var template (omit) SAPI sapi := f_ranap_extract_sapi(ranap);
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27108
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I04a9197ac0b68c2dcb7542d035dc70c9f2b90473
Gerrit-Change-Number: 27108
Gerrit-PatchSet: 2
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged
daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27107 )
Change subject: Iuh_Emulation: Introduce Iuh_ConnHdlr component type
......................................................................
Iuh_Emulation: Introduce Iuh_ConnHdlr component type
Like RAN_ConnHdlr, this contains the ports required for
a ConnHdlr attaching to Iuh_Emulaiton
Change-Id: Icbffedceb65f791306fde74f3bc5b8fe964148b9
---
M hnodeb/HNBGW_ConnectionHandler.ttcn
M library/Iuh_Emulation.ttcn
2 files changed, 8 insertions(+), 3 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/hnodeb/HNBGW_ConnectionHandler.ttcn b/hnodeb/HNBGW_ConnectionHandler.ttcn
index ac280b0..076cb82 100644
--- a/hnodeb/HNBGW_ConnectionHandler.ttcn
+++ b/hnodeb/HNBGW_ConnectionHandler.ttcn
@@ -40,10 +40,8 @@
import from GTPU_Types all;
/* this component represents a single Iuh connection at the HNBGW. */
-type component HNBGW_ConnHdlr extends StatsD_ConnHdlr, GTP_ConnHdlr {
+type component HNBGW_ConnHdlr extends Iuh_ConnHdlr, GTP_ConnHdlr, StatsD_ConnHdlr {
port TELNETasp_PT HNBVTY;
- port HNBAP_PT HNBAP;
- port RUA_PT RUA;
/* HNBLLIF Interface of HNodeB */
port HNBLLIF_CODEC_PT LLSK;
var integer g_llsk_conn_id;
diff --git a/library/Iuh_Emulation.ttcn b/library/Iuh_Emulation.ttcn
index bc8e7c3..e05afe5 100644
--- a/library/Iuh_Emulation.ttcn
+++ b/library/Iuh_Emulation.ttcn
@@ -38,6 +38,13 @@
import from IPL4asp_Types all;
import from DNS_Helpers all;
+/* General "base class" component definition, of which specific implementations
+ * derive themselves by means of the "extends" feature */
+type component Iuh_ConnHdlr {
+ port HNBAP_PT HNBAP;
+ port RUA_PT RUA;
+};
+
type enumerated IUHEM_EventUpDown {
IUHEM_EVENT_DOWN,
IUHEM_EVENT_UP
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27107
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Icbffedceb65f791306fde74f3bc5b8fe964148b9
Gerrit-Change-Number: 27107
Gerrit-PatchSet: 2
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/27155 )
Change subject: scripts/docker-cleanup.sh: use "docker system prune"
......................................................................
scripts/docker-cleanup.sh: use "docker system prune"
Do not only clean up dangling images, but also containers, volumes and
networks.
Related: SYS#5827
Change-Id: If441b251de50063f0229d36fb1bc260a4cb1dd87
---
M scripts/docker-cleanup.sh
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/55/27155/1
diff --git a/scripts/docker-cleanup.sh b/scripts/docker-cleanup.sh
index 90b32b9..34a98b2 100755
--- a/scripts/docker-cleanup.sh
+++ b/scripts/docker-cleanup.sh
@@ -12,4 +12,5 @@
docker rm $CONTAINERS
fi
-docker image prune -f
+# remove dangling images, containers, volumes, and networks (not tagged or associated with a container)
+docker system prune -f
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27155
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: If441b251de50063f0229d36fb1bc260a4cb1dd87
Gerrit-Change-Number: 27155
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/+/27156 )
Change subject: scripts/docker-cleanup.sh: conditional img clean
......................................................................
scripts/docker-cleanup.sh: conditional img clean
Only run the simple image clean code if docuum is not running. It works
well enough in most cases, but has the drawbacks that it never deletes
"latest" images or images not matching "^osmocom-build", and may delete
images that are still being used (OS#5447). With the other tool, all
images are considered for removal, and the ones that have not been used
the longest time are removed first.
Related: OS#5477, OS#5066, SYS#5827
Change-Id: I1cef0833c096de0fa5acf77156bb5dd362e2ef9c
---
M scripts/docker-cleanup.sh
1 file changed, 7 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/56/27156/1
diff --git a/scripts/docker-cleanup.sh b/scripts/docker-cleanup.sh
index 34a98b2..7336ed2 100755
--- a/scripts/docker-cleanup.sh
+++ b/scripts/docker-cleanup.sh
@@ -1,10 +1,13 @@
#!/bin/sh -x
+# simple image cleaning code in case docuum isn't running
# delete all but the latest images
-IMAGES=`docker image ls | grep \^osmocom-build | grep -v latest | awk -F ' ' '{print $1":"$2}'`
-for f in $IMAGES; do
- docker image rm $f
-done
+if [ -z "$(docker ps -q -f name=docuum)" ]; then
+ IMAGES=`docker image ls | grep \^osmocom-build | grep -v latest | awk -F ' ' '{print $1":"$2}'`
+ for f in $IMAGES; do
+ docker image rm $f
+ done
+fi
# delete all containers where we forgot to use --rm with docker run
CONTAINERS="$(docker ps -q -a -f status=exited -f status=created)"
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27156
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I1cef0833c096de0fa5acf77156bb5dd362e2ef9c
Gerrit-Change-Number: 27156
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/+/27157 )
Change subject: ansible: docker: clean vfs storage leftovers
......................................................................
ansible: docker: clean vfs storage leftovers
Docker is configured via ansible to use the overlay2 storage driver
since August 2020 (I20728d6017204c3978e23376baa89de6e91fed1e). Clean up
an unused vfs dir if it is present on the system, as it was the case on
build2-deb9build-ansible with a 190 GiB vfs dir.
Related: OS#5827
Change-Id: I58f3f4a26ad6fa4698d87475cefb6ab21e66b15a
---
M ansible/roles/docker/tasks/main.yml
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/57/27157/1
diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml
index 97df86a..7c7fe85 100644
--- a/ansible/roles/docker/tasks/main.yml
+++ b/ansible/roles/docker/tasks/main.yml
@@ -52,6 +52,10 @@
dest: /etc/docker/daemon.json
notify: restart docker
+# daemon.json configures overlay2 storage driver, clean up vfs leftovers
+- name: cleanup vfs storage dir
+ shell: "docker info | grep -q 'Storage Driver: overlay2' && rm -rf /var/lib/docker/vfs"
+
# After docker is set up, add docuum to clean old docker images
# x86_64 only, as the raspberries need to be upgraded before they can use recent docker images (OS#5453)
- include: docuum.yml
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27157
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I58f3f4a26ad6fa4698d87475cefb6ab21e66b15a
Gerrit-Change-Number: 27157
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/+/27150 )
Change subject: ansible/ansible.cfg: make command output readable
......................................................................
ansible/ansible.cfg: make command output readable
Have a readable output, instead of the default that wraps the output
with stripped new lines inside json.
Related: https://github.com/ansible/ansible/issues/27078#issuecomment-364560173
Change-Id: I88d584a1808d82d75906b350e3bffe9bc73a8c67
---
A ansible/ansible.cfg
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/50/27150/1
diff --git a/ansible/ansible.cfg b/ansible/ansible.cfg
new file mode 100644
index 0000000..11169e6
--- /dev/null
+++ b/ansible/ansible.cfg
@@ -0,0 +1,2 @@
+[defaults]
+stdout_callback=debug
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27150
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I88d584a1808d82d75906b350e3bffe9bc73a8c67
Gerrit-Change-Number: 27150
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/+/27151 )
Change subject: ansible/setup-jenkins-slave: accept rel-change
......................................................................
ansible/setup-jenkins-slave: accept rel-change
Fix for:
W:This must be accepted explicitly before updates for this repository can be applied. See apt-secure(8) manpage for details.
E:Repository 'http://raspbian.raspberrypi.org/raspbian buster InRelease' changed its 'Suite' value from 'stable' to 'oldstable'
Related: https://github.com/ansible/ansible/issues/48352
Change-Id: I90ee8dd49001d6810f2118e9feff3375e87052ea
---
A ansible/roles/apt-allow-relinfo-change/README.md
A ansible/roles/apt-allow-relinfo-change/tasks/main.yml
M ansible/setup-jenkins-slave.yml
3 files changed, 21 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/51/27151/1
diff --git a/ansible/roles/apt-allow-relinfo-change/README.md b/ansible/roles/apt-allow-relinfo-change/README.md
new file mode 100644
index 0000000..cd00a46
--- /dev/null
+++ b/ansible/roles/apt-allow-relinfo-change/README.md
@@ -0,0 +1,12 @@
+---
+When the suite of one debian release changes from stable to oldstable, apt
+stops working with the following error:
+
+```
+W:This must be accepted explicitly before updates for this repository can be applied. See apt-secure(8) manpage for details.
+E:Repository 'http://raspbian.raspberrypi.org/raspbian buster InRelease' changed its 'Suite' value from 'stable' to 'oldstable'
+```
+
+This role configures apt to allow the release info change.
+
+Related: https://github.com/ansible/ansible/issues/48352
diff --git a/ansible/roles/apt-allow-relinfo-change/tasks/main.yml b/ansible/roles/apt-allow-relinfo-change/tasks/main.yml
new file mode 100644
index 0000000..098f5ee
--- /dev/null
+++ b/ansible/roles/apt-allow-relinfo-change/tasks/main.yml
@@ -0,0 +1,7 @@
+---
+- name: "configure to allow release info change"
+ lineinfile:
+ path: /etc/apt/apt.conf.d/99relinfochange
+ state: present
+ create: yes
+ line: Acquire::AllowReleaseInfoChange::Suite "true";
diff --git a/ansible/setup-jenkins-slave.yml b/ansible/setup-jenkins-slave.yml
index 07414aa..05e3bde 100644
--- a/ansible/setup-jenkins-slave.yml
+++ b/ansible/setup-jenkins-slave.yml
@@ -15,6 +15,8 @@
cache_valid_time: 3600
update_cache: yes
roles:
+ - name: apt-allow-relinfo-change
+
- name: docker
jenkins_user: osmocom-build
tags:
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27151
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I90ee8dd49001d6810f2118e9feff3375e87052ea
Gerrit-Change-Number: 27151
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange