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

[S] Change in docker-playground[master]: jenkins-common: fix_perms: chown files too

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36512?usp=email ) Change subject: jenkins-common: fix_perms: chown files too ...................................................................... jenkins-common: fix_perms: chown files too Ensure the user that runs docker owns files in cache and data dirs during fix_perms, if an old job created them as root. Change-Id: I43af48bd87e27abad5ad52e734256d78651f67c3 --- M jenkins-common.sh 1 file changed, 16 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/jenkins-common.sh b/jenkins-common.sh index 59224a0..f22158b 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -386,7 +386,10 @@ -v $CACHE_DIR:/cache \ --name ${BUILD_TAG}-cleaner \ "debian:$DEBIAN_DEFAULT" \ - chmod -R a+rX /data/ /cache/ + sh -e -x -c " + chmod -R a+rX /data/ /cache/ + chown -R $(id -u):$(id -g) /data /cache + " } collect_logs() { -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36512?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I43af48bd87e27abad5ad52e734256d78651f67c3 Gerrit-Change-Number: 36512 Gerrit-PatchSet: 4 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-MessageType: merged

1 year, 2 months

1
0
0 0

[S] Change in docker-playground[master]: scripts/kernel-test: put mknod commands in init.sh

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36513?usp=email ) Change subject: scripts/kernel-test: put mknod commands in init.sh ...................................................................... scripts/kernel-test: put mknod commands in init.sh Prepare to run the preparation without root rights. Change-Id: I07648f058ca55515ffc7396598147a03dcfe7976 --- M scripts/kernel-test/initrd-build.sh M scripts/kernel-test/initrd-init.sh 2 files changed, 16 insertions(+), 5 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/scripts/kernel-test/initrd-build.sh b/scripts/kernel-test/initrd-build.sh index e97ff89..a754d2d 100755 --- a/scripts/kernel-test/initrd-build.sh +++ b/scripts/kernel-test/initrd-build.sh @@ -117,11 +117,6 @@ initrd_add_file \ /lib/modules/*/modules.dep -mknod dev/null c 1 3 - -# Required for osmo-ggsn -mknod dev/net/tun c 10 200 - cp /kernel-test/initrd-init.sh init # Add project specific files (e.g. osmo-ggsn and gtp kernel module) diff --git a/scripts/kernel-test/initrd-init.sh b/scripts/kernel-test/initrd-init.sh index c2d936a..bc3aa59 100755 --- a/scripts/kernel-test/initrd-init.sh +++ b/scripts/kernel-test/initrd-init.sh @@ -9,6 +9,11 @@ /bin/busybox --install -s +mknod /dev/null c 1 3 + +# Required for osmo-ggsn +mknod /dev/net/tun c 10 200 + hostname qemu mount -t proc proc /proc -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36513?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I07648f058ca55515ffc7396598147a03dcfe7976 Gerrit-Change-Number: 36513 Gerrit-PatchSet: 4 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-MessageType: merged

1 year, 2 months

1
0
0 0

[M] Change in docker-playground[master]: scripts/kernel-test: build initrd+kernel as user

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36514?usp=email ) Change subject: scripts/kernel-test: build initrd+kernel as user ...................................................................... scripts/kernel-test: build initrd+kernel as user Refactor code to build the initramfs and kernel as user, instead of running related code as root. Put the smoke_test.log into /tmp instead of the cache dir, so we don't write as root into the cache dir. We cat it on error anyway, so we don't need to have it in the workspace. Change-Id: I1670dd86f2670f42eb99e4527d483965d8222402 --- M jenkins-common.sh M scripts/kernel-test/prepare.sh A scripts/kernel-test/smoke-test.sh 3 files changed, 46 insertions(+), 19 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/jenkins-common.sh b/jenkins-common.sh index f22158b..eae0473 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -467,11 +467,12 @@ cp "$initrd_project_script" \ "$CACHE_DIR/kernel-test/initrd-project-script.sh" + fix_perms + + # Build kernel and initramfs docker run \ --rm \ - --cap-add=NET_ADMIN \ - $(docker_kvm_param) \ - --device /dev/net/tun:/dev/net/tun \ + --user "build" \ -v "$CACHE_DIR:/cache" \ -v "$KERNEL_TEST_DIR:/kernel-test:ro" \ -e "KERNEL_BRANCH=$KERNEL_BRANCH" \ @@ -480,11 +481,25 @@ -e "KERNEL_REMOTE_NAME=$KERNEL_REMOTE_NAME" \ -e "KERNEL_URL=$KERNEL_URL" \ -e "KERNEL_SKIP_REBUILD=$KERNEL_SKIP_REBUILD" \ - -e "KERNEL_SKIP_SMOKE_TEST=$KERNEL_SKIP_SMOKE_TEST" \ $DOCKER_ARGS \ "$@" \ "$docker_image" \ "/kernel-test/prepare.sh" + + # Smoke test + if [ "$KERNEL_SKIP_SMOKE_TEST" != 1 ]; then + docker run \ + --rm \ + --cap-add=NET_ADMIN \ + $(docker_kvm_param) \ + --device /dev/net/tun:/dev/net/tun \ + -v "$CACHE_DIR:/cache" \ + -v "$KERNEL_TEST_DIR:/kernel-test:ro" \ + $DOCKER_ARGS \ + "$@" \ + "$docker_image" \ + "/kernel-test/smoke-test.sh" + fi } # Wait until the linux kernel is booted inside QEMU inside docker, and the diff --git a/scripts/kernel-test/prepare.sh b/scripts/kernel-test/prepare.sh index 1f1d1d5..a93a93d 100755 --- a/scripts/kernel-test/prepare.sh +++ b/scripts/kernel-test/prepare.sh @@ -1,17 +1,6 @@ #!/bin/sh -ex KERNEL_BUILD="${KERNEL_BUILD:-0}" -# Test if the kernel boots up, and initd code runs through without error -kernel_smoke_test() { - local log=/cache/kernel-test/smoke_test.log - /kernel-test/run-qemu.sh SMOKE_TEST > "$log" 2>&1 || true - if ! grep -q SMOKE_TEST_SUCCESS "$log"; then - cat "$log" - echo "ERROR: failed to boot the kernel and initrd in QEMU!" - exit 1 - fi -} - /kernel-test/initrd-build.sh if [ "$KERNEL_BUILD" = 1 ]; then @@ -19,7 +8,3 @@ else cp /boot/vmlinuz-* /cache/kernel-test/linux fi - -if [ "$KERNEL_SKIP_SMOKE_TEST" != 1 ]; then - kernel_smoke_test -fi diff --git a/scripts/kernel-test/smoke-test.sh b/scripts/kernel-test/smoke-test.sh new file mode 100755 index 0000000..b0570dd --- /dev/null +++ b/scripts/kernel-test/smoke-test.sh @@ -0,0 +1,13 @@ +#!/bin/sh -ex +# Test if the kernel boots up, and initd code runs through without error + +LOG=/tmp/smoke_test.log + +/kernel-test/run-qemu.sh SMOKE_TEST > "$LOG" 2>&1 || true + +if ! grep -q SMOKE_TEST_SUCCESS "$LOG"; then + cat "$LOG" + set +x + echo "ERROR: failed to boot the kernel and initrd in QEMU!" + exit 1 +fi -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36514?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1670dd86f2670f42eb99e4527d483965d8222402 Gerrit-Change-Number: 36514 Gerrit-PatchSet: 5 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-MessageType: merged

1 year, 2 months

1
0
0 0

[S] Change in meta-telephony[201705]: libosmo-abis: upgrade to 1.5.2

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/36517?usp=email ) Change subject: libosmo-abis: upgrade to 1.5.2 ...................................................................... libosmo-abis: upgrade to 1.5.2 Related: OS#6375 Change-Id: I93473988714a2743a81388e253d5f67d81ac7f17 --- M recipes-osmocom/libosmo-abis/libosmo-abis_git.bb 1 file changed, 12 insertions(+), 2 deletions(-) Approvals: osmith: Verified pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb index 40a3bf2..685b9df 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "1.5.0" +SRCREV = "1.5.2" SRC_URI = "git://gerrit.osmocom.org/libosmo-abis.git;protocol=https;tag=${SRCREV};nobr…" -PV = "1.5.0+gitr${SRCPV}" +PV = "1.5.2+gitr${SRCPV}" PR = "${INC_PR}.0" -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/36517?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I93473988714a2743a81388e253d5f67d81ac7f17 Gerrit-Change-Number: 36517 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 2 months

1
0
0 0

[S] Change in docker-playground[master]: debian-bookworm-build: add virtualenv

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36516?usp=email ) Change subject: debian-bookworm-build: add virtualenv ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36516?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I5d087b8edb9e77a5226df9e4f55e04480eea45dd Gerrit-Change-Number: 36516 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Apr 2024 12:38:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in meta-telephony[201705]: libosmo-abis: upgrade to 1.5.2

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/36517?usp=email ) Change subject: libosmo-abis: upgrade to 1.5.2 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/36517?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I93473988714a2743a81388e253d5f67d81ac7f17 Gerrit-Change-Number: 36517 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Apr 2024 12:36:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in meta-telephony[201705]: libosmo-abis: upgrade to 1.5.2

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/36517?usp=email ) Change subject: libosmo-abis: upgrade to 1.5.2 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/36517?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I93473988714a2743a81388e253d5f67d81ac7f17 Gerrit-Change-Number: 36517 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Apr 2024 12:23:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[M] Change in docker-playground[master]: scripts/kernel-test: build initrd+kernel as user

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36514?usp=email ) Change subject: scripts/kernel-test: build initrd+kernel as user ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36514?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1670dd86f2670f42eb99e4527d483965d8222402 Gerrit-Change-Number: 36514 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Apr 2024 12:22:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in docker-playground[master]: scripts/kernel-test: put mknod commands in init.sh

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36513?usp=email ) Change subject: scripts/kernel-test: put mknod commands in init.sh ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36513?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I07648f058ca55515ffc7396598147a03dcfe7976 Gerrit-Change-Number: 36513 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Apr 2024 12:21:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in docker-playground[master]: scripts/kernel-test: do shallow fetch

by pespin

Attention is currently required from: laforge, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36510?usp=email ) Change subject: scripts/kernel-test: do shallow fetch ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36510?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I92d90c1451ff6abff2df3b1318b5194880e77f2e Gerrit-Change-Number: 36510 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 03 Apr 2024 12:21:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2024