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

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

by laforge

Attention is currently required from: osmith. laforge 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 2: Code-Review+1 -- 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: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Apr 2024 10:52:09 +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 laforge

Attention is currently required from: osmith. laforge 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 1: Code-Review+1 -- 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: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Apr 2024 10:51:47 +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]: jenkins-common: fix_perms: chown files too

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36512?usp=email ) Change subject: jenkins-common: fix_perms: chown files too ...................................................................... Patch Set 1: Code-Review+1 -- 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: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Apr 2024 10:51:30 +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]: kernel-test/kernel-build: update net-next branch

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36511?usp=email ) Change subject: kernel-test/kernel-build: update net-next branch ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36511?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: Id7544960c50c948231046882e4d76085e8180f10 Gerrit-Change-Number: 36511 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Apr 2024 10:51:10 +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 laforge

Attention is currently required from: osmith. laforge 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+1 (1 comment) Patchset: PS1: I presume you've tested this manually somehow? I've only very rarely worked with shallow clones and only in "fire and forget" situations, not where we actually keep them around and fetch new/updated commits on top at a later point. So I'm not entirely sure about the implications. -- 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Apr 2024 10:50:46 +0000 Gerrit-HasComments: Yes 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 osmith

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/36514?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder 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(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/14/36514/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: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 2 months

1
0
0 0

[S] Change in osmo-ci[master]: jobs/ttcn3: …-pablo-gtp: don't wipe workspace

by osmith

Attention is currently required from: laforge, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36486?usp=email ) Change subject: jobs/ttcn3: …-pablo-gtp: don't wipe workspace ...................................................................... Patch Set 1: (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-ci/+/36486/comment/51e571b7_557204f4 PS1, Line 10: cloning the kernel repositories takes a long time and lots of traffic I've implemented shallow fetching here: https://gerrit.osmocom.org/c/docker-playground/+/36510 (Note that before it used to clone once per jenkins node and then work on that, but agreed, shallow fetching is even better and saves more traffic.) > Also: if we know there are [likely] other kernel trees around somewhere in [other] workspaces, we can specify those with --reference-if-able to get any objects locally, if available/present. this is a cool feature, maybe we can use this in the future. right now the cloning + building kernel and initramfs is done inside a docker container, it would need rewriting to be able to potentially access git trees from other workspaces. so I'm leaving it as-is for now. File jobs/ttcn3-testsuites.yml: https://gerrit.osmocom.org/c/osmo-ci/+/36486/comment/e902ee6c_19da609f PS1, Line 35: wipe_workspace: false > maybe document it with a comment here on why this is needed. Done (used same comment as with the other wipe_workspace: false lines for kernel tests below) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36486?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4ac1b2c3f5ba63c131dd1d6a4888f32a27264eba Gerrit-Change-Number: 36486 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Apr 2024 10:32:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> 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 osmith

osmith has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/13/36513/1 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: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

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 uploaded this change for review. ( 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. Change-Id: I1670dd86f2670f42eb99e4527d483965d8222402 --- M jenkins-common.sh M scripts/kernel-test/prepare.sh A scripts/kernel-test/smoke-test.sh 3 files changed, 43 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/14/36514/1 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..ff4b9c8 --- /dev/null +++ b/scripts/kernel-test/smoke-test.sh @@ -0,0 +1,12 @@ +#!/bin/sh -ex +# Test if the kernel boots up, and initd code runs through without error + +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" + 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: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 2 months

1
0
0 0

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

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36510?usp=email ) Change subject: scripts/kernel-test: do shallow fetch ...................................................................... scripts/kernel-test: do shallow fetch Instead of fetching the entire history, only fetch the most recent commit. Change-Id: I92d90c1451ff6abff2df3b1318b5194880e77f2e --- M scripts/kernel-test/kernel-build.sh 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/10/36510/1 diff --git a/scripts/kernel-test/kernel-build.sh b/scripts/kernel-test/kernel-build.sh index d2127e4..9bd8064 100755 --- a/scripts/kernel-test/kernel-build.sh +++ b/scripts/kernel-test/kernel-build.sh @@ -39,7 +39,7 @@ fi fi - git fetch "$KERNEL_REMOTE_NAME" + git fetch --depth=1 "$KERNEL_REMOTE_NAME" git checkout "$KERNEL_REMOTE_NAME/$KERNEL_BRANCH" } -- 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-MessageType: newchange

1 year, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2024