Skip to content

Changes

Summary

  1. osmo-uecups-master: remove useradd (details)
  2. scripts/kernel-test: adjust to usr-merge (details)
  3. scripts/kernel-test/run-qemu: set init=/init (details)
  4. scripts/kernel-test/run-qemu: update qemu args (details)
  5. scripts/kernel-test: fixup for initrd_add_file (details)
  6. hnbgw: Skip asn1 talloc mem checks in osmo-hnbgw-latest (details)
Commit 94f8a8147ec788674f4f561a9571aec49bc7b0e1 by Oliver Smith
osmo-uecups-master: remove useradd

debian-bookworm-build already adds a user (as it is a combination of
debian-bullseye-build and debian-bullseye-jenkins, and the latter did
it). Remove the additional useradd in osmo-uecups-master to fix:

useradd: UID 1000 is not unique

I've looked through related configs and scripts and the username is not
hardcoded there.

Related: OS#6057
Change-Id: I28f2a110167f550e1b38332ed4e7124b9e76f312
The file was modified osmo-uecups-master/Dockerfile
Commit 0660fc4e4b3da2f4711c11fa476a0fcdd1b4932c by Oliver Smith
scripts/kernel-test: adjust to usr-merge

In debian bookworm, the /usr merge has been implemented:

  /bin → /usr/bin
  /sbin → /usr/sbin
  /lib → /usr/lib
  /lib64 → /usr/lib64

The initramfs filesystem layout is derived from the paths of the
binaries and libraries in the full system. Create the same symlinks and
adjust initrd_add_bin so it does not trip over the symlinks.

I've also considered to change all input for initrd_add_bin to point at
the /usr/… paths. But this is not possible, for example ldd/lddtree will
point at libraries in /lib and /lib64, and this gets passed to
initrd_add_bin.

Without this patch, the init script and all binaries called from it
cannot be executed.

Related: OS#6057
Related: https://wiki.debian.org/UsrMerge
Change-Id: I975d3af0fa88869688673936a08189de800fba29
The file was modified scripts/kernel-test/initrd-build.sh
Commit 90e48a63e00142d332d67da0b75a1f8ef2dd2b38 by Oliver Smith
scripts/kernel-test/run-qemu: set init=/init

Set init= so the kernel doesn't try to run other scripts if /init
fails:

[    2.946381] Run /init as init process
[    2.948885] Failed to execute /init (error -2)
[    2.949051] Run /sbin/init as init process
[    2.949329] Run /etc/init as init process
[    2.949566] Run /bin/init as init process
[    2.949795] Run /bin/sh as init process

Change-Id: I063c7625acaa15130d8361d4e944c3773c9b37c4
The file was modified scripts/kernel-test/run-qemu.sh
Commit 29bd71264db9d5f674a4bd2e1099aa6a8c4b1178 by Oliver Smith
scripts/kernel-test/run-qemu: update qemu args

Fix these warnings:

warning: short-form boolean option 'server' deprecated
warning: short-form boolean option 'nowait' deprecated

Change-Id: Iba84d8e61c2d9cbd687d803066db0c04aca9f805
The file was modified scripts/kernel-test/run-qemu.sh
Commit cb707e83c814c029aa1cf8b9e1de41139bd5a91b by Oliver Smith
scripts/kernel-test: fixup for initrd_add_file

The previous versions happened to work too in my testing with
osmo-ggsn. Use the correct loop variable.

Fixes: 0660fc4e ("scripts/kernel-test: adjust to usr-merge")
Change-Id: I0c0ca91116a8cd156b185bb53512371bbcb76515
The file was modified scripts/kernel-test/initrd-build.sh
Commit cb4897e4c09f7213c929dfd85f1657d697e6bf3d by Pau Espin Pedrol
hnbgw: Skip asn1 talloc mem checks in osmo-hnbgw-latest

Depends: osmo-ttcn3-hacks.git Change-Id I5c18cf2d6797bcf0bef13d71ab0b69f1403b474f
Change-Id: I1a933795ffef3cea97fcf34b1c513e71f3256c83
The file was modified ttcn3-hnbgw-test/HNBGW_Tests.cfg
The file was modified ttcn3-hnbgw-test/jenkins.sh