October 2024 - gerrit-log - lists.osmocom.org

[XS] Change in osmo-ci[master]: jobs: gerrit-verifications.yml: Add job for upf-benchmark.git
by osmith 08 Oct '24

08 Oct '24

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ci/+/38330?usp=email ) Change subject: jobs: gerrit-verifications.yml: Add job for upf-benchmark.git ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38330?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7212e8f88c731993af01e0e42ddaad6dd7291c37 Gerrit-Change-Number: 38330 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Oct 2024 07:40:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-dev[master]: Add support to build upf-benchmark
by osmith 08 Oct '24

08 Oct '24

Attention is currently required from: neels, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-dev/+/38352?usp=email ) Change subject: Add support to build upf-benchmark ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/38352?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I8a1d817d3255643e0ad3bfa634143fc71038d113 Gerrit-Change-Number: 38352 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Oct 2024 07:38:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: update osmo-stp.cfg to make STP_Tests work at all again
by osmith 08 Oct '24

08 Oct '24

Attention is currently required from: laforge. osmith has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38021?usp=email ) Change subject: update osmo-stp.cfg to make STP_Tests work at all again ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38021?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7f0cef55a9a54f1cc4b23df781dab2afd52aae78 Gerrit-Change-Number: 38021 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 08 Oct 2024 07:36:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[L] Change in osmo-ci[master]: jobs/build-kernels-testenv: new jobs
by osmith 08 Oct '24

08 Oct '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/38345?usp=email ) Change subject: jobs/build-kernels-testenv: new jobs ...................................................................... jobs/build-kernels-testenv: new jobs Prepare to replace the docker-playground based jobs for running osmo-ggsn in QEMU with a kernel built from source with testenv. Split the part that builds the kernels into extra jobs that export the built kernels as artifacts. This makes it easier to use kernels outside of jenkins too and it allows retriggering only a testsuite run without also building the kernel again. The fragment.config is imported from docker-playground current master 978adc, path: ttcn3-ggsn-test/osmo-ggsn-kernel/fragment.config Change-Id: Id64a1a778fa38eec20498c36b390332f75d7d3f5 --- M jobs/README.md A jobs/build-kernels-testenv.yml A scripts/kernel/build.sh A scripts/kernel/fragment.config 4 files changed, 378 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/jobs/README.md b/jobs/README.md index 56b5dfd..f7e704e 100644 --- a/jobs/README.md +++ b/jobs/README.md @@ -162,6 +162,7 @@ 22:XX coverity 22:XX octsim_osmo-ccid-firmware 22:XX osmo-gsm-tester-runner (virtual) + 23:XX build-kernels-testenv 23:XX master-builds-dahdi 00:XX osmocom-api 00:XX registry-update-base-images diff --git a/jobs/build-kernels-testenv.yml b/jobs/build-kernels-testenv.yml new file mode 100644 index 0000000..3e9ad75 --- /dev/null +++ b/jobs/build-kernels-testenv.yml @@ -0,0 +1,83 @@ +--- +- project: + name: 'build-kernels' + concurrent: false + description: | + Build kernels to be used with osmo-ttcn3-hacks to run SUT in QEMU. + + Git repository: + <code>{url}</code> + + Branch: + <code>{branch}</code> + jobs: + - "{job-name}" + branch: master + job-name: + - build-kernel-net-next: + url: "https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git" + branch: main + - build-kernel-torvalds: + url: "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" + +- job-template: + name: '{job-name}' + project-type: freestyle + defaults: global + description: '{obj:description}' + # Limit to 1 node to save space on others + node: "build4-deb12build-ansible" + concurrent: false + parameters: + - string: + name: EMAIL_NOTIFICATIONS + description: For failed build notifications, set to empty to disable + default: 'jenkins-notifications(a)lists.osmocom.org' + - string: + name: BRANCH_KERNEL + description: Branch of the kernel repository + default: '{branch}' + - string: + name: BRANCH_CI + description: Branch of osmo-ci.git (has scripts/kernel/build.sh) + default: 'master' + builders: + - shell: |- + IMAGE="osmocom-build/debian-bookworm-osmo-ttcn3-testenv" + podman pull "registry.osmocom.org/$IMAGE" + + rm -rf output osmo-ci + git clone --depth=1 https://gerrit.osmocom.org/osmo-ci -b "$BRANCH_CI" + osmo-ci/scripts/kernel/build.sh + scm: + - git: + branches: + - '$BRANCH_KERNEL' + url: "{obj:url}" + git-config-name: 'Jenkins Builder' + git-config-email: 'jenkins(a)osmocom.org' + refspec: '$BRANCH_KERNEL' + shallow-clone: true + wipe-workspace: false + clean: + before: true + triggers: + - timed: "H 23 * * *" + publishers: + - email: + notify-every-unstable-build: false + recipients: '$EMAIL_NOTIFICATIONS' + send-to-individuals: false + - archive: + allow-empty: false + artifacts: output/**/* + case-sensitive: true + default-excludes: true + fingerprint: false + only-if-success: false + properties: + - build-discarder: + num-to-keep: 10 + wrappers: + - ansicolor: + colormap: xterm diff --git a/scripts/kernel/build.sh b/scripts/kernel/build.sh new file mode 100755 index 0000000..cc69a0d --- /dev/null +++ b/scripts/kernel/build.sh @@ -0,0 +1,19 @@ +#!/bin/sh -ex +IMAGE="debian-bookworm-osmo-ttcn3-testenv" +SCRIPT_DIR="$(realpath "$(dirname "$0")")" + +mkdir -p output + +podman run \ + --rm \ + -v "$SCRIPT_DIR:/scripts/kernel/" \ + -v "$PWD:$PWD" \ + -w "$PWD" \ + "$IMAGE" \ + timeout 3h sh -exc ' + make defconfig + scripts/kconfig/merge_config.sh -m .config /scripts/kernel/fragment.config + make olddefconfig + make "-j$(nproc)" + cp arch/x86/boot/bzImage output/linux + ' | tee output/build.log diff --git a/scripts/kernel/fragment.config b/scripts/kernel/fragment.config new file mode 100644 index 0000000..b6e2071 --- /dev/null +++ b/scripts/kernel/fragment.config @@ -0,0 +1,275 @@ +# CONFIG_ACPI_BGRT is not set +CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_SHA1=y +# CONFIG_EFI_STUB is not set +CONFIG_FAILOVER=y +CONFIG_FDDI=y +CONFIG_GTP=y +CONFIG_HAMRADIO=y +CONFIG_HYPERVISOR_GUEST=y +CONFIG_INPUT_MOUSEDEV=y +CONFIG_IP_NF_NAT=y +CONFIG_IP_NF_TARGET_MASQUERADE=y +CONFIG_IP_SET=y +CONFIG_LEGACY_VSYSCALL_EMULATE=y +# CONFIG_LEGACY_VSYSCALL_XONLY is not set +CONFIG_LIBCRC32C=y +CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_NETFILTER_ADVANCED=y +CONFIG_NETFILTER_NETLINK_GLUE_CT=y +CONFIG_NETFILTER_XT_MARK=y +CONFIG_NETFILTER_XT_NAT=y +CONFIG_NETFILTER_XT_TARGET_LOG=y +CONFIG_NETFILTER_XT_TARGET_MASQUERADE=y +CONFIG_NET_9P=y +CONFIG_NET_FAILOVER=y +CONFIG_NF_LOG_COMMON=y +CONFIG_NF_LOG_IPV4=y +CONFIG_NF_LOG_IPV6=y +CONFIG_OVERLAY_FS=y +CONFIG_PAGE_REPORTING=y +CONFIG_PARTITION_ADVANCED=y +CONFIG_PCIEAER=y +# CONFIG_R8169 is not set +# CONFIG_RANDOMIZE_BASE is not set +CONFIG_RAS=y +# CONFIG_RCU_TRACE is not set +# CONFIG_REALTEK_PHY is not set +CONFIG_SND_HDA_PREALLOC_SIZE=64 +CONFIG_SND_OSSEMUL=y +# CONFIG_STRICT_DEVMEM is not set +CONFIG_UEVENT_HELPER=y +# CONFIG_USB is not set +CONFIG_VIRTIO_MMIO=y +CONFIG_VIRTIO_PCI=y +CONFIG_9P_FS=y +CONFIG_9P_FS_POSIX_ACL=y +CONFIG_9P_FS_SECURITY=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_ACPI_EXTLOG is not set +# CONFIG_ACRN_GUEST is not set +# CONFIG_AIX_PARTITION is not set +CONFIG_AMIGA_PARTITION=y +CONFIG_ARCH_CPUIDLE_HALTPOLL=y +# CONFIG_ATARI_PARTITION is not set +# CONFIG_AX25 is not set +CONFIG_BALLOON_COMPACTION=y +CONFIG_BLK_MQ_VIRTIO=y +CONFIG_BSD_DISKLABEL=y +# CONFIG_CMDLINE_PARTITION is not set +# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set +CONFIG_CRYPTO_DEV_VIRTIO=y +CONFIG_CRYPTO_ENGINE=y +CONFIG_CRYPTO_LIB_DES=y +# CONFIG_DEFXX is not set +# CONFIG_DRM_VIRTIO_GPU is not set +CONFIG_EDAC=y +# CONFIG_EDAC_AMD64 is not set +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_DECODE_MCE=y +# CONFIG_EDAC_E752X is not set +# CONFIG_EDAC_I10NM is not set +# CONFIG_EDAC_I3000 is not set +# CONFIG_EDAC_I3200 is not set +# CONFIG_EDAC_I5000 is not set +# CONFIG_EDAC_I5100 is not set +# CONFIG_EDAC_I5400 is not set +# CONFIG_EDAC_I7300 is not set +# CONFIG_EDAC_I7CORE is not set +# CONFIG_EDAC_I82975X is not set +# CONFIG_EDAC_IE31200 is not set +# CONFIG_EDAC_IGEN6 is not set +CONFIG_EDAC_LEGACY_SYSFS=y +# CONFIG_EDAC_PND2 is not set +# CONFIG_EDAC_SBRIDGE is not set +# CONFIG_EDAC_SKX is not set +# CONFIG_EDAC_X38 is not set +CONFIG_HALTPOLL_CPUIDLE=y +# CONFIG_HW_RANDOM_VIRTIO is not set +# CONFIG_HYPERV is not set +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_RPFILTER is not set +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_SRH is not set +CONFIG_IP6_NF_NAT=y +# CONFIG_IP6_NF_SECURITY is not set +# CONFIG_IP6_NF_TARGET_HL is not set +CONFIG_IP6_NF_TARGET_MASQUERADE=y +# CONFIG_IP6_NF_TARGET_NPT is not set +# CONFIG_IP6_NF_TARGET_SYNPROXY is not set +# CONFIG_IP_NF_ARPTABLES is not set +# CONFIG_IP_NF_MATCH_AH is not set +# CONFIG_IP_NF_MATCH_ECN is not set +# CONFIG_IP_NF_MATCH_RPFILTER is not set +# CONFIG_IP_NF_MATCH_TTL is not set +# CONFIG_IP_NF_SECURITY is not set +# CONFIG_IP_NF_TARGET_CLUSTERIP is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_NETMAP is not set +# CONFIG_IP_NF_TARGET_REDIRECT is not set +# CONFIG_IP_NF_TARGET_SYNPROXY is not set +# CONFIG_IP_NF_TARGET_TTL is not set +# CONFIG_IP_SET_BITMAP_IP is not set +# CONFIG_IP_SET_BITMAP_IPMAC is not set +# CONFIG_IP_SET_BITMAP_PORT is not set +# CONFIG_IP_SET_HASH_IP is not set +# CONFIG_IP_SET_HASH_IPMAC is not set +# CONFIG_IP_SET_HASH_IPMARK is not set +# CONFIG_IP_SET_HASH_IPPORT is not set +# CONFIG_IP_SET_HASH_IPPORTIP is not set +# CONFIG_IP_SET_HASH_IPPORTNET is not set +# CONFIG_IP_SET_HASH_MAC is not set +# CONFIG_IP_SET_HASH_NET is not set +# CONFIG_IP_SET_HASH_NETIFACE is not set +# CONFIG_IP_SET_HASH_NETNET is not set +# CONFIG_IP_SET_HASH_NETPORT is not set +# CONFIG_IP_SET_HASH_NETPORTNET is not set +# CONFIG_IP_SET_LIST_SET is not set +CONFIG_IP_SET_MAX=256 +# CONFIG_JAILHOUSE_GUEST is not set +CONFIG_KARMA_PARTITION=y +CONFIG_KVM_GUEST=y +# CONFIG_LDM_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MEMORY_BALLOON=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_MMU_GATHER_RCU_TABLE_FREE=y +CONFIG_MMU_GATHER_TABLE_FREE=y +# CONFIG_MOUSE_PS2_VMMOUSE is not set +# CONFIG_NETFILTER_NETLINK_ACCT is not set +# CONFIG_NETFILTER_NETLINK_OSF is not set +# CONFIG_NETFILTER_NETLINK_QUEUE is not set +CONFIG_NETFILTER_XT_CONNMARK=y +# CONFIG_NETFILTER_XT_MATCH_BPF is not set +# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set +# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set +# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set +# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set +# CONFIG_NETFILTER_XT_MATCH_CPU is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ECN is not set +# CONFIG_NETFILTER_XT_MATCH_ESP is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_HELPER is not set +# CONFIG_NETFILTER_XT_MATCH_HL is not set +# CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set +# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set +# CONFIG_NETFILTER_XT_MATCH_L2TP is not set +# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set +# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_MAC is not set +CONFIG_NETFILTER_XT_MATCH_MARK=y +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set +# CONFIG_NETFILTER_XT_MATCH_OSF is not set +# CONFIG_NETFILTER_XT_MATCH_OWNER is not set +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_RECENT is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_TIME is not set +# CONFIG_NETFILTER_XT_MATCH_U32 is not set +# CONFIG_NETFILTER_XT_SET is not set +# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set +# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +# CONFIG_NETFILTER_XT_TARGET_HL is not set +# CONFIG_NETFILTER_XT_TARGET_HMARK is not set +# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set +# CONFIG_NETFILTER_XT_TARGET_LED is not set +# CONFIG_NETFILTER_XT_TARGET_MARK is not set +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set +# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set +# CONFIG_NETFILTER_XT_TARGET_TEE is not set +# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set +# CONFIG_NET_9P_DEBUG is not set +CONFIG_NET_9P_VIRTIO=y +# CONFIG_NET_ACT_CONNMARK is not set +# CONFIG_NET_ACT_CTINFO is not set +# CONFIG_NET_EMATCH_IPSET is not set +CONFIG_NET_UDP_TUNNEL=y +# CONFIG_NF_CONNTRACK_AMANDA is not set +# CONFIG_NF_CONNTRACK_EVENTS is not set +# CONFIG_NF_CONNTRACK_H323 is not set +CONFIG_NF_CONNTRACK_MARK=y +# CONFIG_NF_CONNTRACK_PPTP is not set +# CONFIG_NF_CONNTRACK_SANE is not set +# CONFIG_NF_CONNTRACK_SNMP is not set +# CONFIG_NF_CONNTRACK_TFTP is not set +# CONFIG_NF_CONNTRACK_TIMEOUT is not set +# CONFIG_NF_CONNTRACK_TIMESTAMP is not set +# CONFIG_NF_CONNTRACK_ZONES is not set +CONFIG_NF_CT_PROTO_DCCP=y +CONFIG_NF_CT_PROTO_SCTP=y +CONFIG_NF_CT_PROTO_UDPLITE=y +CONFIG_OSF_PARTITION=y +# CONFIG_OVERLAY_FS_INDEX is not set +# CONFIG_OVERLAY_FS_METACOPY is not set +CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y +CONFIG_OVERLAY_FS_REDIRECT_DIR=y +# CONFIG_OVERLAY_FS_XINO_AUTO is not set +CONFIG_PARAVIRT=y +CONFIG_PARAVIRT_CLOCK=y +# CONFIG_PARAVIRT_DEBUG is not set +# CONFIG_PARAVIRT_SPINLOCKS is not set +# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set +# CONFIG_PCIEAER_INJECT is not set +# CONFIG_PCIE_DPC is not set +# CONFIG_PCIE_ECRC is not set +CONFIG_PTP_1588_CLOCK_KVM=y +# CONFIG_PTP_1588_CLOCK_VMW is not set +# CONFIG_PVH is not set +CONFIG_SGI_PARTITION=y +# CONFIG_SKFP is not set +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +CONFIG_SND_SEQ_MIDI_EVENT=y +CONFIG_SOLARIS_X86_PARTITION=y +CONFIG_SOUND_OSS_CORE=y +CONFIG_SOUND_OSS_CORE_PRECLAIM=y +CONFIG_SUN_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +# CONFIG_ULTRIX_PARTITION is not set +CONFIG_UNIXWARE_DISKLABEL=y +CONFIG_VIRTIO=y +CONFIG_VIRTIO_BALLOON=y +CONFIG_VIRTIO_BLK=y +CONFIG_VIRTIO_INPUT=y +# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set +CONFIG_VIRTIO_NET=y +CONFIG_VIRTIO_PCI_LEGACY=y +CONFIG_X86_HV_CALLBACK_VECTOR=y +# CONFIG_X86_X2APIC is not set +# CONFIG_XEN is not set + +CONFIG_DYNAMIC_DEBUG=y + +# For libgtpnl's qemu tests +CONFIG_NAMESPACES=y +CONFIG_NET_NS=y +CONFIG_VETH=y -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38345?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: Id64a1a778fa38eec20498c36b390332f75d7d3f5 Gerrit-Change-Number: 38345 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in osmo-ci[master]: jobs/build-kernels-testenv: new jobs
by osmith 08 Oct '24

08 Oct '24

osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/38345?usp=email ) Change subject: jobs/build-kernels-testenv: new jobs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38345?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id64a1a778fa38eec20498c36b390332f75d7d3f5 Gerrit-Change-Number: 38345 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Oct 2024 07:32:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ttcn3-hacks[master]: ggsn: osmo-ggsn.src.cfg: tweak log output
by osmith 08 Oct '24

08 Oct '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38339?usp=email ) Change subject: ggsn: osmo-ggsn.src.cfg: tweak log output ...................................................................... ggsn: osmo-ggsn.src.cfg: tweak log output * Print log levels. * Don't print categories as hex. * Print the basename at the end of the line. * Remove "logging level lgtp debug", there already is "logging level lgtp info" further above, and this is a more sensible setting. With "debug" there are way too many log messages in e.g. TC_lots_of_concurrent_pdp_ctx. Change-Id: I771d07645ea6da91f2c93f0954d99a37c866629a --- M ggsn_tests/osmo-ggsn/osmo-ggsn.src.cfg 1 file changed, 3 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/ggsn_tests/osmo-ggsn/osmo-ggsn.src.cfg b/ggsn_tests/osmo-ggsn/osmo-ggsn.src.cfg index e9dca06..23a21f4 100644 --- a/ggsn_tests/osmo-ggsn/osmo-ggsn.src.cfg +++ b/ggsn_tests/osmo-ggsn/osmo-ggsn.src.cfg @@ -9,9 +9,12 @@ log stderr logging filter all 1 logging color 1 + logging print category-hex 0 logging print category 1 logging timestamp 1 logging print extended-timestamp 1 + logging print file basename last + logging print level 1 logging level ip info logging level tun info logging level ggsn info @@ -34,7 +37,6 @@ logging level lsua notice logging level lm3ua notice logging level lmgcp notice - logging level lgtp debug ! stats interval 5 ! -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38339?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I771d07645ea6da91f2c93f0954d99a37c866629a Gerrit-Change-Number: 38339 Gerrit-PatchSet: 1 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>

1 0

[M] Change in osmo-ttcn3-hacks[master]: ggsn: testenv: replace dummy netdev with bridge
by osmith 08 Oct '24

08 Oct '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38340?usp=email ) Change subject: ggsn: testenv: replace dummy netdev with bridge ...................................................................... ggsn: testenv: replace dummy netdev with bridge Replace the dummy netdev that was used as network device reachable through the GTP tunnel that can answer ICMP, with a bridge device. The bridge device fulfils the same purpose, plus it can be used in a future patch to connect osmo-ggsn when it is running in QEMU with the testsuite. Change-Id: I102d5b9ed0b3cafc263ad489ed4d4652f5e6dac8 --- M _testenv/data/podman/Dockerfile A _testenv/data/scripts/add_remove_testenv0_bridge.sh M _testenv/testenv/requirements.py M ggsn_tests/open5gs/testenv.sh M ggsn_tests/osmo-ggsn/testenv.sh 5 files changed, 53 insertions(+), 38 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/_testenv/data/podman/Dockerfile b/_testenv/data/podman/Dockerfile index 294ea82..13412a2 100644 --- a/_testenv/data/podman/Dockerfile +++ b/_testenv/data/podman/Dockerfile @@ -17,6 +17,7 @@ autoconf \ automake \ bison \ + bridge-utils \ build-essential \ ca-certificates \ ccache \ diff --git a/_testenv/data/scripts/add_remove_testenv0_bridge.sh b/_testenv/data/scripts/add_remove_testenv0_bridge.sh new file mode 100755 index 0000000..cb1b6a3 --- /dev/null +++ b/_testenv/data/scripts/add_remove_testenv0_bridge.sh @@ -0,0 +1,41 @@ +#!/bin/sh -e +# Call this as or from within a clean= script to add and remove a testenv0 +# bridge device, which can be used to talk to a SUT running in QEMU. +# Set env var EXTRA_IPS to add additional IP addresses to the device. +DEV="testenv0" +IP4="172.18.3.201/24" +IP6="fd02:db8:3::201/128" +set -x + +add_bridge() { + local ip + + sudo brctl addbr "$DEV" + sudo ip link set "$DEV" up + + for ip in $IP4 $IP6 $EXTRA_IPS; do + sudo ip addr add "$ip" dev "$DEV" + done +} + +del_bridge() { + if ip link ls dev "$DEV" >/dev/null 2>&1; then + sudo ip link set "$DEV" down + sudo brctl delbr "$DEV" + fi +} + +case "$TESTENV_CLEAN_REASON" in + prepare) + del_bridge + add_bridge + ;; + crashed|finished) + del_bridge + ;; + *) + set +x + echo "ERROR: unexpected TESTENV_CLEAN_REASON: $TESTENV_CLEAN_REASON" + exit 1 + ;; +esac diff --git a/_testenv/testenv/requirements.py b/_testenv/testenv/requirements.py index d65e436..7c39a7c 100644 --- a/_testenv/testenv/requirements.py +++ b/_testenv/testenv/requirements.py @@ -24,6 +24,7 @@ programs += [ "autoconf", "automake", + "brctl", "ccache", "dumpcap", "g++", diff --git a/ggsn_tests/open5gs/testenv.sh b/ggsn_tests/open5gs/testenv.sh index 9cc1c70..e06d771 100755 --- a/ggsn_tests/open5gs/testenv.sh +++ b/ggsn_tests/open5gs/testenv.sh @@ -1,5 +1,4 @@ #!/bin/sh -ex -DEV=ggsn_dummy check_usage() { if [ -z "$TESTENV_CLEAN_REASON" ]; then @@ -65,34 +64,21 @@ del_tun "ogstun46" } -add_dummy_netdev() { - # Add a network device reachable through the GTP tunnel that can answer ICMP - # pings (for e.g. TC_pdp4_act_deact_gtpu_access) - sudo ip link add "$DEV" type dummy - sudo ip addr add "172.18.3.201" dev "$DEV" - sudo ip addr add "fd02:db8:3::201" dev "$DEV" - sudo ip link set "$DEV" up -} - -del_dummy_netdev() { - if ip link ls dev "$DEV" >/dev/null 2>&1; then - sudo ip link del "$DEV" - fi -} - check_usage +# Add a bridge reachable through the GTP tunnel that can answer ICMP +# pings (for e.g. TC_pdp4_act_deact_gtpu_access). The bridge is also used to +# connect the SUT when it runs in QEMU. +add_remove_testenv0_bridge.sh + case "$TESTENV_CLEAN_REASON" in prepare) setcap_open5gs_upfd adjust_ttcn3_config - del_dummy_netdev del_tun_all - add_dummy_netdev add_tun_all ;; crashed|finished) - del_dummy_netdev del_tun_all ;; *) diff --git a/ggsn_tests/osmo-ggsn/testenv.sh b/ggsn_tests/osmo-ggsn/testenv.sh index d797d44..0275ad2 100755 --- a/ggsn_tests/osmo-ggsn/testenv.sh +++ b/ggsn_tests/osmo-ggsn/testenv.sh @@ -1,6 +1,5 @@ #!/bin/sh -ex CONFIG="$1" # all, v4_only, etc. -DEV=ggsn_dummy check_usage() { local valid="all|v4_only|v6_only|v4v6_only" @@ -41,21 +40,6 @@ sudo setcap CAP_NET_ADMIN=+eip $(which osmo-ggsn) } -add_dummy_netdev() { - # Add a network device reachable through the GTP tunnel that can answer ICMP - # pings (for e.g. TC_pdp4_act_deact_gtpu_access) - sudo ip link add "$DEV" type dummy - sudo ip addr add "172.18.3.201" dev "$DEV" - sudo ip addr add "fd02:db8:3::201" dev "$DEV" - sudo ip link set "$DEV" up -} - -del_dummy_netdev() { - if ip link ls dev "$DEV" >/dev/null 2>&1; then - sudo ip link del "$DEV" - fi -} - rename_junit_xml_classname() { if [ "$CONFIG" != "all" ]; then ( cd ../testsuite @@ -65,16 +49,18 @@ check_usage +# Add a bridge reachable through the GTP tunnel that can answer ICMP +# pings (for e.g. TC_pdp4_act_deact_gtpu_access). The bridge is also used to +# connect the SUT when it runs in QEMU. +add_remove_testenv0_bridge.sh + case "$TESTENV_CLEAN_REASON" in prepare) adjust_osmo_ggsn_config adjust_ttcn3_config setcap_osmo_ggsn - del_dummy_netdev - add_dummy_netdev ;; crashed|finished) - del_dummy_netdev rename_junit_xml_classname ;; *) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38340?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I102d5b9ed0b3cafc263ad489ed4d4652f5e6dac8 Gerrit-Change-Number: 38340 Gerrit-PatchSet: 1 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>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: podman: remove mongodb-org.list
by osmith 08 Oct '24

08 Oct '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38337?usp=email ) Change subject: testenv: podman: remove mongodb-org.list ...................................................................... testenv: podman: remove mongodb-org.list Remove mongodb-org.list at the end of building the podman image, as we only need to install mongodb once in the container but won't use the repository afterwards. This avoids checking the mongodb repository in "apt update". Change-Id: I5a0455a4dbf8a31366bff65fd011fd5494b64ea7 --- M _testenv/data/podman/Dockerfile 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/_testenv/data/podman/Dockerfile b/_testenv/data/podman/Dockerfile index 42b0635..013c03d 100644 --- a/_testenv/data/podman/Dockerfile +++ b/_testenv/data/podman/Dockerfile @@ -121,4 +121,5 @@ apt-get install -y mongodb-org && \ apt-get clean && \ cd / && \ - rm -rf /tmp/mongodb + rm -rf /tmp/mongodb && \ + rm /etc/apt/sources.list.d/mongodb-org.list -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38337?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5a0455a4dbf8a31366bff65fd011fd5494b64ea7 Gerrit-Change-Number: 38337 Gerrit-PatchSet: 1 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>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: requirements: find programs in /usr/sbin
by osmith 08 Oct '24

08 Oct '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38336?usp=email ) Change subject: testenv: requirements: find programs in /usr/sbin ...................................................................... testenv: requirements: find programs in /usr/sbin Fix that testenv complains about a missing setcap program, if it is in /usr/sbin/setcap and /usr/sbin is not in PATH as it is the case with Debian. We actually run setcap with sudo when it is needed, and in that case /usr/sbin gets added to PATH in Debian. Fix for: [testenv] Missing program: setcap Change-Id: Ibbccba013ac38415ef46467f97bef846b848cf39 --- M _testenv/testenv/requirements.py 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/_testenv/testenv/requirements.py b/_testenv/testenv/requirements.py index 7badbe9..d65e436 100644 --- a/_testenv/testenv/requirements.py +++ b/_testenv/testenv/requirements.py @@ -38,6 +38,12 @@ abort = False for program in programs: if not shutil.which(program): + if os.path.exists(os.path.join("/usr/sbin", program)): + # Debian: some programs such as setcap are in /usr/sbin, which + # is not in PATH unless using sudo. Therefore "shutil.which()" + # won't find it. + continue + logging.error(f"Missing program: {program}") if program == "ttcn3_compiler": -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38336?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibbccba013ac38415ef46467f97bef846b848cf39 Gerrit-Change-Number: 38336 Gerrit-PatchSet: 1 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>

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: podman: don't install GUI packages
by osmith 08 Oct '24

08 Oct '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38338?usp=email ) Change subject: testenv: podman: don't install GUI packages ...................................................................... testenv: podman: don't install GUI packages Install erlang-nox and use the pre-built rebar3 as linked from rebar3.org, instead of using the Debian package to avoid pulling in ~600 MB of GUI dependencies. Related: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1083096 Change-Id: I27f58d1f102cf85ff7ff301c52696b65150e2898 --- M _testenv/data/podman/Dockerfile 1 file changed, 9 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/_testenv/data/podman/Dockerfile b/_testenv/data/podman/Dockerfile index 013c03d..294ea82 100644 --- a/_testenv/data/podman/Dockerfile +++ b/_testenv/data/podman/Dockerfile @@ -21,6 +21,7 @@ ca-certificates \ ccache \ cmake \ + erlang-nox \ flex \ gdb \ git \ @@ -62,7 +63,6 @@ procps \ psmisc \ python3-pip \ - rebar3 \ rsync \ source-highlight \ sqlite3 \ @@ -74,6 +74,14 @@ && \ apt-get clean +# Install rebar3 as described in https://rebar3.org/docs/getting-started/ +# instead of using the Debian package, as the latter pulls in ~600 MB of GUI +# dependencies that we don't need: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1083096 +RUN wget https://s3.amazonaws.com/rebar3/rebar3 -O /usr/bin/rebar3 && \ + chmod +x /usr/bin/rebar3 && \ + rebar3 --version + # Ccache is installed above so it can be optionally used when rebuilding the # testsuites inside the docker containers. Don't use it by default. ENV USE_CCACHE=0 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38338?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I27f58d1f102cf85ff7ff301c52696b65150e2898 Gerrit-Change-Number: 38338 Gerrit-PatchSet: 1 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>

1 0