* [xenomai-images][PATCH 0/9] LAVA Setup
@ 2019-09-05 15:44 Q. Gylstorff
2019-09-05 15:44 ` [xenomai-images][PATCH 1/9] ci: Add LAVA jobs for targets Q. Gylstorff
` (9 more replies)
0 siblings, 10 replies; 33+ messages in thread
From: Q. Gylstorff @ 2019-09-05 15:44 UTC (permalink / raw)
To: xenomai
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
This patchset adapts xenomai-images for the execution of tests
on Linaro Automated Validation Architecture.
Quirin Gylstorff (9):
ci: Add LAVA jobs for targets
machine: Allow override of the image type
linux-xenomai: NFS support in KERNEL configuration
beagle-bone-black: Add Devicetree and fake-hwclock
kas: Use next as target
ci: Add inline xenomai testsuite
README: correct build line
kernel: Update
tests/README: Add deployment and Setup
.gitlab-ci.yml | 58 +++++++++++--
README.md | 2 +-
conf/machine/beagle-bone-black.conf | 3 +-
conf/machine/hikey.conf | 4 +-
conf/machine/qemu-arm64.conf | 1 -
conf/machine/x86-64-efi.conf | 2 +-
kas.yml | 2 +-
recipes-core/images/demo-image.bb | 2 +-
recipes-kernel/linux/files/amd64_defconfig | 29 +++++--
recipes-kernel/linux/linux-xenomai_4.19.bb | 12 ++-
scripts/deploy_for_testing.sh | 34 ++++++++
scripts/run-lava-tests.sh | 30 +++++++
tests/README.md | 42 ++++++++++
tests/jobs/xenomai-beaglebone.yml | 76 +++++++++++++++++
tests/jobs/xenomai-minnow.yml | 73 ++++++++++++++++
tests/jobs/xenomai-qemu-amd64.yml | 87 ++++++++++++++++++++
tests/jobs/xenomai-qemu-arm64.yml | 96 ++++++++++++++++++++++
tests/jobs/xenomai-qemu-armhf.yml | 87 ++++++++++++++++++++
tests/jobs/xenomai-x86-64.yml | 74 +++++++++++++++++
xenomai-lava-test.yml | 20 +++++
20 files changed, 704 insertions(+), 30 deletions(-)
create mode 100755 scripts/deploy_for_testing.sh
create mode 100755 scripts/run-lava-tests.sh
create mode 100644 tests/README.md
create mode 100644 tests/jobs/xenomai-beaglebone.yml
create mode 100644 tests/jobs/xenomai-minnow.yml
create mode 100644 tests/jobs/xenomai-qemu-amd64.yml
create mode 100644 tests/jobs/xenomai-qemu-arm64.yml
create mode 100644 tests/jobs/xenomai-qemu-armhf.yml
create mode 100644 tests/jobs/xenomai-x86-64.yml
create mode 100644 xenomai-lava-test.yml
--
2.20.1
^ permalink raw reply [flat|nested] 33+ messages in thread* [xenomai-images][PATCH 1/9] ci: Add LAVA jobs for targets 2019-09-05 15:44 [xenomai-images][PATCH 0/9] LAVA Setup Q. Gylstorff @ 2019-09-05 15:44 ` Q. Gylstorff 2019-09-10 9:56 ` Jan Kiszka 2019-09-05 15:44 ` [xenomai-images][PATCH 2/9] machine: Allow override of the image type Q. Gylstorff ` (8 subsequent siblings) 9 siblings, 1 reply; 33+ messages in thread From: Q. Gylstorff @ 2019-09-05 15:44 UTC (permalink / raw) To: xenomai From: Quirin Gylstorff <quirin.gylstorff@siemens.com> Set up a LAVA Lab and add jobs for each target. These job descriptions deploy the build image to the target and run the LAVA basic smoketest suite for each target. Add lsb-release for smoke-test Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> --- .gitlab-ci.yml | 54 +++++++++++++++++--- recipes-core/images/demo-image.bb | 2 +- scripts/deploy_for_testing.sh | 34 +++++++++++++ scripts/run-lava-tests.sh | 30 +++++++++++ tests/README.md | 24 +++++++++ tests/jobs/xenomai-beaglebone.yml | 65 ++++++++++++++++++++++++ tests/jobs/xenomai-minnow.yml | 62 +++++++++++++++++++++++ tests/jobs/xenomai-qemu-amd64.yml | 76 ++++++++++++++++++++++++++++ tests/jobs/xenomai-qemu-arm64.yml | 83 +++++++++++++++++++++++++++++++ tests/jobs/xenomai-qemu-armhf.yml | 76 ++++++++++++++++++++++++++++ tests/jobs/xenomai-x86-64.yml | 63 +++++++++++++++++++++++ 11 files changed, 561 insertions(+), 8 deletions(-) create mode 100755 scripts/deploy_for_testing.sh create mode 100755 scripts/run-lava-tests.sh create mode 100644 tests/README.md create mode 100644 tests/jobs/xenomai-beaglebone.yml create mode 100644 tests/jobs/xenomai-minnow.yml create mode 100644 tests/jobs/xenomai-qemu-amd64.yml create mode 100644 tests/jobs/xenomai-qemu-arm64.yml create mode 100644 tests/jobs/xenomai-qemu-armhf.yml create mode 100644 tests/jobs/xenomai-x86-64.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index deecfb1..b78a0ac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,37 +1,77 @@ +# +# Xenomai Real-Time System +# +# Copyright (c) Siemens AG, 2019 +# +# Authors: +# Quirin Gylstorff <quirin.gylstorff@siemens.com> +# +# SPDX-License-Identifier: MIT +# +stages: + - build variables: GIT_STRATEGY: clone -variables: http_proxy: "$HTTP_PROXY" https_proxy: "$HTTPS_PROXY" ftp_proxy: "$FTP_PROXY" no_proxy: "$NO_PROXY" +default: + image: kasproject/kas-isar:latest + +# add lavacli to the container and install the ssh keys +# for the test infrastructure +.add-lava-ssh-config: &lava-ssh-key + before_script: + - sudo apt update + - sudo apt install lavacli -y + - mkdir -p -m=700 ~/.ssh + - echo "$LAVA_UPLOAD_KEY" | tr -d '\r' > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa + - echo "ProxyCommand socat - PROXY:$(echo $https_proxy | sed 's|.*://\([^:]*\).*|\1|'):%h:%p,proxyport=$(echo $https_proxy | sed 's|.*:\([0-9]*\)$|\1|')" >> ~/.ssh/config && chmod 600 ~/.ssh/config + - echo "$LAVA_KNOWN_HOST" >> ~/.ssh/known_hosts && chmod 644 ~/.ssh/known_hosts + build:qemu-amd64: + <<: *lava-ssh-key stage: build - image: kasproject/kas-isar:latest script: - kas build kas.yml:board-qemu-amd64.yml + - scripts/deploy_for_testing.sh qemu-amd64 + - scripts/run-lava-tests.sh qemu-amd64 + build:qemu-armhf: stage: build - image: kasproject/kas-isar:latest script: - kas build kas.yml:board-qemu-armhf.yml + - scripts/deploy_for_testing.sh qemu-armhf + - scripts/run-lava-tests.sh qemu-armhf + + build:qemu-arm64: + <<: *lava-ssh-key stage: build - image: kasproject/kas-isar:latest script: - kas build kas.yml:board-qemu-arm64.yml + - scripts/deploy_for_testing.sh qemu-arm64 + - scripts/run-lava-tests.sh qemu-arm64 + build:board-hikey: stage: build - image: kasproject/kas-isar:latest script: - kas build kas.yml:board-hikey.yml +# hikey is currently not part of the testlab + build:board-beaglebone: + <<: *lava-ssh-key stage: build - image: kasproject/kas-isar:latest script: - kas build kas.yml:board-beagle-bone-black.yml + - scripts/deploy_for_testing.sh beagle-bone-black + - scripts/run-lava-tests.sh beaglebone + build:board-x86-64-efi: + <<: *lava-ssh-key stage: build - image: kasproject/kas-isar:latest script: - kas build kas.yml:board-x86-64-efi.yml + - scripts/deploy_for_testing.sh x86-64-efi + - scripts/run-lava-tests.sh x86-64 diff --git a/recipes-core/images/demo-image.bb b/recipes-core/images/demo-image.bb index 8afad67..02976fa 100644 --- a/recipes-core/images/demo-image.bb +++ b/recipes-core/images/demo-image.bb @@ -18,7 +18,7 @@ IMAGE_PREINSTALL += " \ bash-completion less vim nano man \ ifupdown isc-dhcp-client net-tools iputils-ping ssh \ iw wireless-tools wpasupplicant \ - gdb" + gdb lsb-release" IMAGE_INSTALL += "xenomai-runtime" IMAGE_INSTALL += "customizations expand-on-first-boot" diff --git a/scripts/deploy_for_testing.sh b/scripts/deploy_for_testing.sh new file mode 100755 index 0000000..d02b6ed --- /dev/null +++ b/scripts/deploy_for_testing.sh @@ -0,0 +1,34 @@ +#!/bin/sh + +# +# Xenomai Real-Time System +# +# Copyright (c) Siemens AG, 2019 +# +# Authors: +# Quirin Gylstorff <quirin.gylstorff@siemens.com> +# +# SPDX-License-Identifier: MIT +# +set -e +TARGET="$1" + +if [ -z ${TARGET} ]; then + exit -1 +fi +IMAGES_DIR=build/tmp/deploy/images +LAVA_MASTER="${LAVA_USER}@${LAVA_HOST}" +#KERNEL +scp -P ${LAVA_PORT} ${IMAGES_DIR}/${TARGET}/demo-image-xenomai-demo-${TARGET}-vmlinuz \ + ${LAVA_MASTER}:/var/lib/lava/artifacts +# INITRD +scp -P ${LAVA_PORT} ${IMAGES_DIR}/${TARGET}/demo-image-xenomai-demo-${TARGET}-initrd.img \ + ${LAVA_MASTER}:/var/lib/lava/artifacts +# ROOTFS +scp -P ${LAVA_PORT} ${IMAGES_DIR}/${TARGET}/demo-image-xenomai-demo-${TARGET}.* \ + ${LAVA_MASTER}:/var/lib/lava/artifacts +# DTB +DTB="${IMAGES_DIR}/${TARGET}/*.dtb" +if [ -e ${DTB} ]; then + scp -P ${LAVA_PORT} ${DTB} ${LAVA_MASTER}:/var/lib/lava/artifacts +fi diff --git a/scripts/run-lava-tests.sh b/scripts/run-lava-tests.sh new file mode 100755 index 0000000..705add7 --- /dev/null +++ b/scripts/run-lava-tests.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# +# Xenomai Real-Time System +# +# Copyright (c) Siemens AG, 2019 +# +# Authors: +# Quirin Gylstorff <quirin.gylstorff@siemens.com> +# +# SPDX-License-Identifier: MIT +# +set -e +TARGET=$1 + +LAVA_MASTER="${LAVA_USER}@${LAVA_HOST}" + +# open connection for ssh port forwarding +ssh -N -p ${LAVA_PORT} -o 'LocalForward localhost:28080 localhost:80' ${LAVA_MASTER} & + +# connect to lava master +lavacli identities add --token ${LAVA_TOKEN} --uri http://localhost:28080 --username siemens default + +test_id=$(lavacli jobs submit tests/jobs/xenomai-${TARGET}.yml) +lavacli jobs logs ${test_id} +lavacli results ${test_id} +# change return code to generate a error in gitlab-ci if a test is failed +number_of_fails=$(lavacli results ${test_id} | grep fail | wc -l) +if [ "${number_of_fails}" -ge "0" ]; then + exit 1 +fi diff --git a/tests/README.md b/tests/README.md new file mode 100644 index 0000000..c7e2030 --- /dev/null +++ b/tests/README.md @@ -0,0 +1,24 @@ +# Testing + +For image testing this project uses the +[Linaro Automated Validation Architecture(LAVA)](https://www.lavasoftware.org/). +The images are generate a gitlab-ci pipeline. This pipline builds the images and +sends them to the lava testlab. + +## Test targets + +following images are test: +- qemu-arm64 +- qemu-amd64 +- x86-64-efi +- beagle-bone-black + +## Tests + +Currently the following tests are executed on each target: +- lava-smoketest + +### lava-smoketest + +The lava smoke tests are part of http://git.linaro.org/lava-team/lava-functional-tests.git +and check machine data from the target. diff --git a/tests/jobs/xenomai-beaglebone.yml b/tests/jobs/xenomai-beaglebone.yml new file mode 100644 index 0000000..231c5d0 --- /dev/null +++ b/tests/jobs/xenomai-beaglebone.yml @@ -0,0 +1,65 @@ +# +# Xenomai Real-Time System +# +# Copyright (c) Siemens AG, 2019 +# +# Authors: +# Quirin Gylstorff <quirin.gylstorff@siemens.com> +# +# SPDX-License-Identifier: MIT +# +job_name: xenomai-test-suite +device_type: beaglebone-black + +timeouts: + job: + minutes: 30 + action: + minutes: 20 + connection: + minutes: 2 +priority: medium +visibility: public + +metadata: + # please change these fields when modifying this job for your own tests. + docs-source: xenomai-beagleboneblack + docs-filename: pipeline-xenomai-beagleboneblack +context: + console_device: ttyO + baud_rate: 115200 +# ACTION_BLOCK +actions: +- deploy: + timeout: + minutes: 5 + to: tftp + kernel: + url: http://localhost/artifacts/demo-image-xenomai-demo-beagle-bone-black-vmlinuz + type: zimage + dtb: + url: http://localhost/artifacts/am335x-boneblack.dtb + nfsrootfs: + url: http://localhost/artifacts/demo-image-xenomai-demo-beagle-bone-black.tar.gz + compression: gz +# BOOT_BLOCK +- boot: + timeout: + minutes: 5 + method: u-boot + commands: nfs + prompts: ["root@demo:"] + auto_login: + login_prompt: 'demo login:' + username: root + password_prompt: 'Password:' + password: root + +- test: + timeout: + minutes: 30 + definitions: + - repository: http://git.linaro.org/lava-team/lava-functional-tests.git + from: git + path: lava-test-shell/smoke-tests-basic.yaml + name: smoke-tests diff --git a/tests/jobs/xenomai-minnow.yml b/tests/jobs/xenomai-minnow.yml new file mode 100644 index 0000000..d60628d --- /dev/null +++ b/tests/jobs/xenomai-minnow.yml @@ -0,0 +1,62 @@ +# +# Xenomai Real-Time System +# +# Copyright (c) Siemens AG, 2019 +# +# Authors: +# Quirin Gylstorff <quirin.gylstorff@siemens.com> +# +# SPDX-License-Identifier: MIT +# +job_name: xenomai-test-suite +device_type: minnowboard-max-E3825 +timeouts: + job: + minutes: 30 + action: + minutes: 20 + connection: + minutes: 2 +priority: medium +visibility: public + +metadata: + # please change these fields when modifying this job for your own tests. + docs-source: xenomai-cof + docs-filename: pipeline-xenomai-cof +# ACTION_BLOCK +actions: +- deploy: + timeout: + minutes: 5 + to: tftp + kernel: + url: http://localhost/artifacts/demo-image-xenomai-demo-x86-64-efi-vmlinuz + type: bzimage + ramdisk: + url: http://localhost/artifacts/demo-image-xenomai-demo-x86-64-efi-initrd.img + compression: gz + nfsrootfs: + url: http://localhost/artifacts/demo-image-xenomai-demo-x86-64-efi.tar.gz + compression: gz +# BOOT_BLOCK +- boot: + timeout: + minutes: 5 + method: grub + commands: nfs + prompts: ["root@demo:"] + auto_login: + login_prompt: 'demo login:' + username: root + password_prompt: 'Password:' + password: root + +- test: + timeout: + minutes: 30 + definitions: + - repository: http://git.linaro.org/lava-team/lava-functional-tests.git + from: git + path: lava-test-shell/smoke-tests-basic.yaml + name: smoke-tests diff --git a/tests/jobs/xenomai-qemu-amd64.yml b/tests/jobs/xenomai-qemu-amd64.yml new file mode 100644 index 0000000..12f4c7f --- /dev/null +++ b/tests/jobs/xenomai-qemu-amd64.yml @@ -0,0 +1,76 @@ +# +# Xenomai Real-Time System +# +# Copyright (c) Siemens AG, 2019 +# +# Authors: +# Quirin Gylstorff <quirin.gylstorff@siemens.com> +# +# SPDX-License-Identifier: MIT +# +device_type: qemu +job_name: QEMU pipeline, xenomai-images-qemu-amd64 + +timeouts: + job: + minutes: 15 + action: + minutes: 5 + connection: + minutes: 2 +priority: medium +visibility: public + +# context allows specific values to be overridden or included +context: + # tell the qemu template which architecture is being tested + # the template uses that to ensure that qemu-system-x86_64 is executed. + arch: amd64 + extra_options: + - -smp + - 4 + - -nographic + - -enable-kvm + - -machine q35 + - -device ide-hd,drive=disk +metadata: + # please change these fields when modifying this job for your own tests. + docs-source: xenomai-qemu-amd64 + docs-filename: qemu-pipeline-xenomai-amd64 + +# ACTION_BLOCK +actions: +- deploy: + timeout: + minutes: 5 + to: tmpfs + images: + kernel: + image_arg: -kernel {kernel} -append "root=/dev/sdb console=ttyS0,115200 console=tty0" + url: http://localhost/artifacts/demo-image-xenomai-demo-qemu-amd64-vmlinuz + initrd: + image_arg: -initrd {initrd} + url: http://localhost/artifacts/demo-image-xenomai-demo-qemu-amd64-initrd.img + rootfs: + image_arg: -drive file={rootfs},discard=unmap,if=none,id=disk,format=raw + url: http://localhost/artifacts/demo-image-xenomai-demo-qemu-amd64.ext4.img + +# BOOT_BLOCK +- boot: + timeout: + minutes: 2 + method: qemu + media: tmpfs + prompts: ["root@demo:"] + auto_login: + login_prompt: 'demo login:' + username: root + password_prompt: 'Password:' + password: root + +- test: + definitions: + - repository: http://git.linaro.org/lava-team/lava-functional-tests.git + from: git + path: lava-test-shell/smoke-tests-basic.yaml + name: smoke-tests diff --git a/tests/jobs/xenomai-qemu-arm64.yml b/tests/jobs/xenomai-qemu-arm64.yml new file mode 100644 index 0000000..fceee0c --- /dev/null +++ b/tests/jobs/xenomai-qemu-arm64.yml @@ -0,0 +1,83 @@ +# +# Xenomai Real-Time System +# +# Copyright (c) Siemens AG, 2019 +# +# Authors: +# Quirin Gylstorff <quirin.gylstorff@siemens.com> +# +# SPDX-License-Identifier: MIT +# +device_type: qemu +job_name: QEMU pipeline, xenomai-images-qemu-arm64 + +timeouts: + job: + minutes: 15 + action: + minutes: 5 + connection: + minutes: 2 +priority: medium +visibility: public + +# context allows specific values to be overridden or included +context: + # tell the qemu template which architecture is being tested + # the template uses that to ensure that qemu-system-x86_64 is executed. + arch: arm64 + extra_options: + - -global + - virtio-blk-device.scsi=off + - -smp + - 4 + - -device + - virtio-serial-device + - -device + - virtconsole,chardev=con + - -chardev + - vc,id=con + - -device + - virtio-blk-device,drive=disk + guestfs_interface: virtio +metadata: + # please change these fields when modifying this job for your own tests. + docs-source: xenomai-qemu-arm64 + docs-filename: qemu-pipeline-xenomai-arm64 + +# ACTION_BLOCK +actions: +- deploy: + timeout: + minutes: 5 + to: tmpfs + images: + kernel: + image_arg: -kernel {kernel} -append "root=/dev/vda" + url: http://localhost/artifacts/demo-image-xenomai-demo-qemu-arm64-vmlinuz + initrd: + image_arg: -initrd {initrd} + url: http://localhost/artifacts/demo-image-xenomai-demo-qemu-arm64-initrd.img + rootfs: + image_arg: -drive file={rootfs},discard=unmap,if=none,id=disk,format=raw + url: http://localhost/artifacts/demo-image-xenomai-demo-qemu-arm64.ext4.img + +# BOOT_BLOCK +- boot: + timeout: + minutes: 2 + method: qemu + media: tmpfs + prompts: ["root@demo:"] + auto_login: + login_prompt: 'demo login:' + username: root + password_prompt: 'Password:' + password: root + +- test: + definitions: + - repository: http://git.linaro.org/lava-team/lava-functional-tests.git + from: git + path: lava-test-shell/smoke-tests-basic.yaml + name: smoke-tests diff --git a/tests/jobs/xenomai-qemu-armhf.yml b/tests/jobs/xenomai-qemu-armhf.yml new file mode 100644 index 0000000..d6603af --- /dev/null +++ b/tests/jobs/xenomai-qemu-armhf.yml @@ -0,0 +1,76 @@ +# +# Xenomai Real-Time System +# +# Copyright (c) Siemens AG, 2019 +# +# Authors: +# Quirin Gylstorff <quirin.gylstorff@siemens.com> +# +# SPDX-License-Identifier: MIT +# +device_type: qemu +job_name: QEMU pipeline, xenomai-images-qemu-armhf + +timeouts: + job: + minutes: 15 + action: + minutes: 5 + connection: + minutes: 2 +priority: medium +visibility: public + +# context allows specific values to be overridden or included +context: + arch: arm + cpu: cortex-a15 + extra_options: + - -smp 4 + - -device virtio-serial-device + - -device virtconsole,chardev=con + - -chardev vc,id=con + - -device virtio-blk-device,bootindex=0,drive=disk + - -device virtio-blk-device,bootindex=1,drive=lavatest + guestfs_interface: none +metadata: + # please change these fields when modifying this job for your own tests. + docs-source: xenomai-qemu-armhf + docs-filename: qemu-pipeline-xenomai-armhf + +# ACTION_BLOCK +actions: +- deploy: + timeout: + minutes: 5 + to: tmpfs + images: + kernel: + image_arg: -kernel {kernel} -append "root=/dev/vdb" + url: http://localhost/artifacts/demo-image-xenomai-demo-qemu-armhf-vmlinuz + initrd: + image_arg: -initrd {initrd} + url: http://localhost/artifacts/demo-image-xenomai-demo-qemu-armhf-initrd.img + rootfs: + image_arg: -drive file={rootfs},discard=unmap,if=none,id=disk,format=raw + url: http://localhost/artifacts/demo-image-xenomai-demo-qemu-armhf.ext4.img + +# BOOT_BLOCK +- boot: + timeout: + minutes: 5 + method: qemu + media: tmpfs + prompts: ["root@demo:"] + auto_login: + login_prompt: 'demo login:' + username: root + password_prompt: 'Password:' + password: root + +- test: + definitions: + - repository: http://git.linaro.org/lava-team/lava-functional-tests.git + from: git + path: lava-test-shell/smoke-tests-basic.yaml + name: smoke-tests diff --git a/tests/jobs/xenomai-x86-64.yml b/tests/jobs/xenomai-x86-64.yml new file mode 100644 index 0000000..0fb3ea8 --- /dev/null +++ b/tests/jobs/xenomai-x86-64.yml @@ -0,0 +1,63 @@ +# +# Xenomai Real-Time System +# +# Copyright (c) Siemens AG, 2019 +# +# Authors: +# Quirin Gylstorff <quirin.gylstorff@siemens.com> +# +# SPDX-License-Identifier: MIT +# +job_name: xenomai-test-suite +device_type: x86 + +timeouts: + job: + minutes: 30 + action: + minutes: 20 + connection: + minutes: 2 +priority: medium +visibility: public + +metadata: + # please change these fields when modifying this job for your own tests. + docs-source: xenomai-cof + docs-filename: pipeline-xenomai-cof +# ACTION_BLOCK +actions: +- deploy: + timeout: + minutes: 5 + to: tftp + kernel: + url: http://localhost/artifacts/demo-image-xenomai-demo-x86-64-efi-vmlinuz + type: bzimage + ramdisk: + url: http://localhost/artifacts/demo-image-xenomai-demo-x86-64-efi-initrd.img + compression: gz + nfsrootfs: + url: http://localhost/artifacts/demo-image-xenomai-demo-x86-64-efi.tar.gz + compression: gz +# BOOT_BLOCK +- boot: + timeout: + minutes: 5 + method: ipxe + commands: nfs + prompts: ["root@demo:"] + auto_login: + login_prompt: 'demo login:' + username: root + password_prompt: 'Password:' + password: root + +- test: + timeout: + minutes: 30 + definitions: + - repository: http://git.linaro.org/lava-team/lava-functional-tests.git + from: git + path: lava-test-shell/smoke-tests-basic.yaml + name: smoke-tests -- 2.20.1 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* Re: [xenomai-images][PATCH 1/9] ci: Add LAVA jobs for targets 2019-09-05 15:44 ` [xenomai-images][PATCH 1/9] ci: Add LAVA jobs for targets Q. Gylstorff @ 2019-09-10 9:56 ` Jan Kiszka 2019-09-10 10:17 ` Quirin Gylstorff 0 siblings, 1 reply; 33+ messages in thread From: Jan Kiszka @ 2019-09-10 9:56 UTC (permalink / raw) To: Q. Gylstorff, xenomai On 05.09.19 17:44, Q. Gylstorff via Xenomai wrote: > From: Quirin Gylstorff <quirin.gylstorff@siemens.com> > > Set up a LAVA Lab and add jobs for each target. These job descriptions > deploy the build image to the target and run the LAVA basic smoketest > suite for each target. Add lsb-release for smoke-test > If someone wants to reuse CI but does not have a LAVA instance: Could we easily make the deployment and test step depend on, say, the LAVA environment variables being non-empty? Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux ^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [xenomai-images][PATCH 1/9] ci: Add LAVA jobs for targets 2019-09-10 9:56 ` Jan Kiszka @ 2019-09-10 10:17 ` Quirin Gylstorff 0 siblings, 0 replies; 33+ messages in thread From: Quirin Gylstorff @ 2019-09-10 10:17 UTC (permalink / raw) To: Jan Kiszka, xenomai On 9/10/19 11:56 AM, Jan Kiszka wrote: > On 05.09.19 17:44, Q. Gylstorff via Xenomai wrote: >> From: Quirin Gylstorff <quirin.gylstorff@siemens.com> >> >> Set up a LAVA Lab and add jobs for each target. These job descriptions >> deploy the build image to the target and run the LAVA basic smoketest >> suite for each target. Add lsb-release for smoke-test >> > > If someone wants to reuse CI but does not have a LAVA instance: Could we > easily make the deployment and test step depend on, say, the LAVA > environment variables being non-empty? I will look into it. It would work with [1]. But that feature is alpha according to gitlab-ci[2]. It would also be part of the split the test and deployment from the build step in .gitlab-ci I mentioned in the outlook. [1]: https://docs.gitlab.com/ee/ci/yaml/#onlyvariablesexceptvariables [2]: https://docs.gitlab.com/ee/ci/yaml/#onlyexcept-advanced Quirin > > Jan > ^ permalink raw reply [flat|nested] 33+ messages in thread
* [xenomai-images][PATCH 2/9] machine: Allow override of the image type 2019-09-05 15:44 [xenomai-images][PATCH 0/9] LAVA Setup Q. Gylstorff 2019-09-05 15:44 ` [xenomai-images][PATCH 1/9] ci: Add LAVA jobs for targets Q. Gylstorff @ 2019-09-05 15:44 ` Q. Gylstorff 2019-09-10 10:25 ` Jan Kiszka 2019-09-05 15:44 ` [xenomai-images][PATCH 3/9] linux-xenomai: NFS support in KERNEL configuration Q. Gylstorff ` (7 subsequent siblings) 9 siblings, 1 reply; 33+ messages in thread From: Q. Gylstorff @ 2019-09-05 15:44 UTC (permalink / raw) To: xenomai From: Quirin Gylstorff <quirin.gylstorff@siemens.com> For the NFS rootfs a tarball is used. This changes allows local.conf to set the IMAGE_TYPE from wic-img to targz-img. Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> --- .gitlab-ci.yml | 4 ++-- conf/machine/hikey.conf | 2 +- conf/machine/x86-64-efi.conf | 2 +- xenomai-lava-test.yml | 20 ++++++++++++++++++++ 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 xenomai-lava-test.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b78a0ac..ebc5cd5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,7 +64,7 @@ build:board-beaglebone: <<: *lava-ssh-key stage: build script: - - kas build kas.yml:board-beagle-bone-black.yml + - kas build kas.yml:board-beagle-bone-black.yml:xenomai-lava-test.yml - scripts/deploy_for_testing.sh beagle-bone-black - scripts/run-lava-tests.sh beaglebone @@ -72,6 +72,6 @@ build:board-x86-64-efi: <<: *lava-ssh-key stage: build script: - - kas build kas.yml:board-x86-64-efi.yml + - kas build kas.yml:board-x86-64-efi.yml:xenomai-lava-test.yml - scripts/deploy_for_testing.sh x86-64-efi - scripts/run-lava-tests.sh x86-64 diff --git a/conf/machine/hikey.conf b/conf/machine/hikey.conf index 465e06e..3c93507 100644 --- a/conf/machine/hikey.conf +++ b/conf/machine/hikey.conf @@ -11,7 +11,7 @@ DISTRO_ARCH = "arm64" -IMAGE_TYPE = "wic-img" +IMAGE_TYPE ?= "wic-img" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" PREFERRED_VERSION_linux-xenomai = "4.14.%" diff --git a/conf/machine/x86-64-efi.conf b/conf/machine/x86-64-efi.conf index 0fd2ef1..02846ff 100644 --- a/conf/machine/x86-64-efi.conf +++ b/conf/machine/x86-64-efi.conf @@ -11,5 +11,5 @@ DISTRO_ARCH = "amd64" -IMAGE_TYPE = "wic-img" +IMAGE_TYPE ?= "wic-img" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" diff --git a/xenomai-lava-test.yml b/xenomai-lava-test.yml new file mode 100644 index 0000000..206aea0 --- /dev/null +++ b/xenomai-lava-test.yml @@ -0,0 +1,20 @@ +# +# Xenomai Real-Time System +# +# Copyright (c) Siemens AG, 2019 +# +# Authors: +# Quirin Gylstorff <quirin.gylstorff@siemens.com> +# +# SPDX-License-Identifier: MIT +# + +header: + version: 8 + +# lava uses nfs to deploy the image. For this we need a tarball instead of +# full image + +local_conf_header: + image-type: | + IMAGE_TYPE = "targz-img" -- 2.20.1 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* Re: [xenomai-images][PATCH 2/9] machine: Allow override of the image type 2019-09-05 15:44 ` [xenomai-images][PATCH 2/9] machine: Allow override of the image type Q. Gylstorff @ 2019-09-10 10:25 ` Jan Kiszka 2019-09-10 11:16 ` Quirin Gylstorff 0 siblings, 1 reply; 33+ messages in thread From: Jan Kiszka @ 2019-09-10 10:25 UTC (permalink / raw) To: Q. Gylstorff, xenomai On 05.09.19 17:44, Q. Gylstorff wrote: > From: Quirin Gylstorff <quirin.gylstorff@siemens.com> > > For the NFS rootfs a tarball is used. This changes allows > local.conf to set the IMAGE_TYPE from wic-img to targz-img. > > Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> > --- > .gitlab-ci.yml | 4 ++-- > conf/machine/hikey.conf | 2 +- > conf/machine/x86-64-efi.conf | 2 +- > xenomai-lava-test.yml | 20 ++++++++++++++++++++ > 4 files changed, 24 insertions(+), 4 deletions(-) > create mode 100644 xenomai-lava-test.yml > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index b78a0ac..ebc5cd5 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -64,7 +64,7 @@ build:board-beaglebone: > <<: *lava-ssh-key > stage: build > script: > - - kas build kas.yml:board-beagle-bone-black.yml > + - kas build kas.yml:board-beagle-bone-black.yml:xenomai-lava-test.yml > - scripts/deploy_for_testing.sh beagle-bone-black > - scripts/run-lava-tests.sh beaglebone > > @@ -72,6 +72,6 @@ build:board-x86-64-efi: > <<: *lava-ssh-key > stage: build > script: > - - kas build kas.yml:board-x86-64-efi.yml > + - kas build kas.yml:board-x86-64-efi.yml:xenomai-lava-test.yml > - scripts/deploy_for_testing.sh x86-64-efi > - scripts/run-lava-tests.sh x86-64 > diff --git a/conf/machine/hikey.conf b/conf/machine/hikey.conf > index 465e06e..3c93507 100644 > --- a/conf/machine/hikey.conf > +++ b/conf/machine/hikey.conf > @@ -11,7 +11,7 @@ > > DISTRO_ARCH = "arm64" > > -IMAGE_TYPE = "wic-img" > +IMAGE_TYPE ?= "wic-img" > IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" > > PREFERRED_VERSION_linux-xenomai = "4.14.%" > diff --git a/conf/machine/x86-64-efi.conf b/conf/machine/x86-64-efi.conf > index 0fd2ef1..02846ff 100644 > --- a/conf/machine/x86-64-efi.conf > +++ b/conf/machine/x86-64-efi.conf > @@ -11,5 +11,5 @@ > > DISTRO_ARCH = "amd64" > > -IMAGE_TYPE = "wic-img" > +IMAGE_TYPE ?= "wic-img" > IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" > diff --git a/xenomai-lava-test.yml b/xenomai-lava-test.yml > new file mode 100644 > index 0000000..206aea0 > --- /dev/null > +++ b/xenomai-lava-test.yml > @@ -0,0 +1,20 @@ > +# > +# Xenomai Real-Time System > +# > +# Copyright (c) Siemens AG, 2019 > +# > +# Authors: > +# Quirin Gylstorff <quirin.gylstorff@siemens.com> > +# > +# SPDX-License-Identifier: MIT > +# > + > +header: > + version: 8 > + > +# lava uses nfs to deploy the image. For this we need a tarball instead of > +# full image > + > +local_conf_header: > + image-type: | > + IMAGE_TYPE = "targz-img" > When reading $subject and the commit log, that new file and the CI changes look misplaced in this patch. Moreover, as this file is encoding an option, let's call it "opt-lava-test.yml". Unrelated: we likely also want some "opt-latest.yml", to switch from the default "stable" by appending this to the kas command. Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux ^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [xenomai-images][PATCH 2/9] machine: Allow override of the image type 2019-09-10 10:25 ` Jan Kiszka @ 2019-09-10 11:16 ` Quirin Gylstorff 0 siblings, 0 replies; 33+ messages in thread From: Quirin Gylstorff @ 2019-09-10 11:16 UTC (permalink / raw) To: Jan Kiszka, xenomai On 9/10/19 12:25 PM, Jan Kiszka wrote: > On 05.09.19 17:44, Q. Gylstorff wrote: >> From: Quirin Gylstorff <quirin.gylstorff@siemens.com> >> >> For the NFS rootfs a tarball is used. This changes allows >> local.conf to set the IMAGE_TYPE from wic-img to targz-img. >> >> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> >> --- >> .gitlab-ci.yml | 4 ++-- >> conf/machine/hikey.conf | 2 +- >> conf/machine/x86-64-efi.conf | 2 +- >> xenomai-lava-test.yml | 20 ++++++++++++++++++++ >> 4 files changed, 24 insertions(+), 4 deletions(-) >> create mode 100644 xenomai-lava-test.yml >> >> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml >> index b78a0ac..ebc5cd5 100644 >> --- a/.gitlab-ci.yml >> +++ b/.gitlab-ci.yml >> @@ -64,7 +64,7 @@ build:board-beaglebone: >> <<: *lava-ssh-key >> stage: build >> script: >> - - kas build kas.yml:board-beagle-bone-black.yml >> + - kas build >> kas.yml:board-beagle-bone-black.yml:xenomai-lava-test.yml >> - scripts/deploy_for_testing.sh beagle-bone-black >> - scripts/run-lava-tests.sh beaglebone >> @@ -72,6 +72,6 @@ build:board-x86-64-efi: >> <<: *lava-ssh-key >> stage: build >> script: >> - - kas build kas.yml:board-x86-64-efi.yml >> + - kas build kas.yml:board-x86-64-efi.yml:xenomai-lava-test.yml >> - scripts/deploy_for_testing.sh x86-64-efi >> - scripts/run-lava-tests.sh x86-64 >> diff --git a/conf/machine/hikey.conf b/conf/machine/hikey.conf >> index 465e06e..3c93507 100644 >> --- a/conf/machine/hikey.conf >> +++ b/conf/machine/hikey.conf >> @@ -11,7 +11,7 @@ >> DISTRO_ARCH = "arm64" >> -IMAGE_TYPE = "wic-img" >> +IMAGE_TYPE ?= "wic-img" >> IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" >> PREFERRED_VERSION_linux-xenomai = "4.14.%" >> diff --git a/conf/machine/x86-64-efi.conf b/conf/machine/x86-64-efi.conf >> index 0fd2ef1..02846ff 100644 >> --- a/conf/machine/x86-64-efi.conf >> +++ b/conf/machine/x86-64-efi.conf >> @@ -11,5 +11,5 @@ >> DISTRO_ARCH = "amd64" >> -IMAGE_TYPE = "wic-img" >> +IMAGE_TYPE ?= "wic-img" >> IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" >> diff --git a/xenomai-lava-test.yml b/xenomai-lava-test.yml >> new file mode 100644 >> index 0000000..206aea0 >> --- /dev/null >> +++ b/xenomai-lava-test.yml >> @@ -0,0 +1,20 @@ >> +# >> +# Xenomai Real-Time System >> +# >> +# Copyright (c) Siemens AG, 2019 >> +# >> +# Authors: >> +# Quirin Gylstorff <quirin.gylstorff@siemens.com> >> +# >> +# SPDX-License-Identifier: MIT >> +# >> + >> +header: >> + version: 8 >> + >> +# lava uses nfs to deploy the image. For this we need a tarball >> instead of >> +# full image >> + >> +local_conf_header: >> + image-type: | >> + IMAGE_TYPE = "targz-img" >> > > When reading $subject and the commit log, that new file and the CI > changes look misplaced in this patch. Moreover, as this file is encoding > an option, let's call it "opt-lava-test.yml". Thanks, I will rename it. > > Unrelated: we likely also want some "opt-latest.yml", to switch from the > default "stable" by appending this to the kas command. > I will add the new option. > Jan > Quirin ^ permalink raw reply [flat|nested] 33+ messages in thread
* [xenomai-images][PATCH 3/9] linux-xenomai: NFS support in KERNEL configuration 2019-09-05 15:44 [xenomai-images][PATCH 0/9] LAVA Setup Q. Gylstorff 2019-09-05 15:44 ` [xenomai-images][PATCH 1/9] ci: Add LAVA jobs for targets Q. Gylstorff 2019-09-05 15:44 ` [xenomai-images][PATCH 2/9] machine: Allow override of the image type Q. Gylstorff @ 2019-09-05 15:44 ` Q. Gylstorff 2019-09-05 15:44 ` [xenomai-images][PATCH 4/9] beagle-bone-black: Add Devicetree and fake-hwclock Q. Gylstorff ` (6 subsequent siblings) 9 siblings, 0 replies; 33+ messages in thread From: Q. Gylstorff @ 2019-09-05 15:44 UTC (permalink / raw) To: xenomai From: Quirin Gylstorff <quirin.gylstorff@siemens.com> LAVA deploys the Rootfs with NFS on the target. Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> --- recipes-kernel/linux/files/amd64_defconfig | 27 ++++++++++++++++------ 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/recipes-kernel/linux/files/amd64_defconfig b/recipes-kernel/linux/files/amd64_defconfig index f8aea8a..cba31a5 100644 --- a/recipes-kernel/linux/files/amd64_defconfig +++ b/recipes-kernel/linux/files/amd64_defconfig @@ -656,7 +656,7 @@ CONFIG_ZONE_DMA=y CONFIG_SMP=y CONFIG_X86_FEATURE_NAMES=y CONFIG_X86_FAST_FEATURE_TESTS=y -# CONFIG_X86_X2APIC is not set +CONFIG_X86_X2APIC=y CONFIG_X86_MPPARSE=y # CONFIG_GOLDFISH is not set CONFIG_RETPOLINE=y @@ -943,6 +943,7 @@ CONFIG_PCI_MMCONFIG=y CONFIG_PCI_DOMAINS=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=y +CONFIG_HOTPLUG_PCI_PCI=y CONFIG_PCIEAER=y # CONFIG_PCIE_ECRC is not set # CONFIG_PCIEAER_INJECT is not set @@ -969,7 +970,7 @@ CONFIG_PCI_IOV=y # CONFIG_PCI_PASID is not set CONFIG_PCI_LABEL=y CONFIG_HOTPLUG_PCI=y -# CONFIG_HOTPLUG_PCI_ACPI is not set +CONFIG_HOTPLUG_PCI_ACPI=y CONFIG_HOTPLUG_PCI_CPCI=y # CONFIG_HOTPLUG_PCI_CPCI_ZT5550 is not set # CONFIG_HOTPLUG_PCI_CPCI_GENERIC is not set @@ -1039,7 +1040,10 @@ CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_ROUTE_MULTIPATH=y CONFIG_IP_ROUTE_VERBOSE=y -# CONFIG_IP_PNP is not set +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE_DEMUX is not set # CONFIG_NET_IP_TUNNEL is not set @@ -1071,7 +1075,7 @@ CONFIG_TCP_CONG_CUBIC=y # CONFIG_TCP_CONG_HSTCP is not set # CONFIG_TCP_CONG_HYBLA is not set # CONFIG_TCP_CONG_VEGAS is not set -# CONFIG_TCP_CONG_NV is not set +# CONFIG_TCP_CONG_NV=y # CONFIG_TCP_CONG_SCALABLE is not set # CONFIG_TCP_CONG_LP is not set # CONFIG_TCP_CONG_VENO is not set @@ -1940,7 +1944,7 @@ CONFIG_NET_VENDOR_QUALCOMM=y CONFIG_NET_VENDOR_REALTEK=y # CONFIG_8139CP is not set # CONFIG_8139TOO is not set -# CONFIG_R8169 is not set +CONFIG_R8169=m CONFIG_NET_VENDOR_RENESAS=y CONFIG_NET_VENDOR_RDC=y # CONFIG_R6040 is not set @@ -3655,7 +3659,16 @@ CONFIG_PSTORE_ZLIB_COMPRESS=y # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y -# CONFIG_NFS_FS is not set +CONFIG_NFS_FS=y +CONFIG_NFS_V2=y +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +CONFIG_NFS_V4_1=y +CONFIG_NFS_V4_2=y +CONFIG_ROOT_NFS=y +CONFIG_NFS_ACL_SUPPORT=y +CONFIG_NFS_COMMON=y # CONFIG_NFSD is not set # CONFIG_CEPH_FS is not set # CONFIG_CIFS is not set @@ -3728,7 +3741,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y # CONFIG_PRINTK_TIME=y CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 -CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 +CONFIG_MESSAGE_LOGLEVEL_DEFAULT=7 # CONFIG_BOOT_PRINTK_DELAY is not set # CONFIG_DYNAMIC_DEBUG is not set -- 2.20.1 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* [xenomai-images][PATCH 4/9] beagle-bone-black: Add Devicetree and fake-hwclock 2019-09-05 15:44 [xenomai-images][PATCH 0/9] LAVA Setup Q. Gylstorff ` (2 preceding siblings ...) 2019-09-05 15:44 ` [xenomai-images][PATCH 3/9] linux-xenomai: NFS support in KERNEL configuration Q. Gylstorff @ 2019-09-05 15:44 ` Q. Gylstorff 2019-09-10 10:27 ` Jan Kiszka 2019-09-05 15:44 ` [xenomai-images][PATCH 5/9] kas: Use next as target Q. Gylstorff ` (5 subsequent siblings) 9 siblings, 1 reply; 33+ messages in thread From: Q. Gylstorff @ 2019-09-05 15:44 UTC (permalink / raw) To: xenomai From: Quirin Gylstorff <quirin.gylstorff@siemens.com> To deploy the target with LAVA it is necessary to use a devicetree. Isar extracts the tree from the kernel build and stores the tree in the deploy-DIR Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> --- conf/machine/beagle-bone-black.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/machine/beagle-bone-black.conf b/conf/machine/beagle-bone-black.conf index 73abe12..90b9f13 100644 --- a/conf/machine/beagle-bone-black.conf +++ b/conf/machine/beagle-bone-black.conf @@ -14,5 +14,6 @@ DISTRO_ARCH = "armhf" IMAGE_INSTALL += "u-boot-script" IMAGE_TYPE ?= "wic-img" - +DTB_FILE = "am335x-boneblack.dtb" IMAGER_INSTALL += "u-boot-omap" +IMAGE_PREINSTALL += "fake-hwclock" -- 2.20.1 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* Re: [xenomai-images][PATCH 4/9] beagle-bone-black: Add Devicetree and fake-hwclock 2019-09-05 15:44 ` [xenomai-images][PATCH 4/9] beagle-bone-black: Add Devicetree and fake-hwclock Q. Gylstorff @ 2019-09-10 10:27 ` Jan Kiszka 2019-09-10 11:18 ` Quirin Gylstorff ` (10 more replies) 0 siblings, 11 replies; 33+ messages in thread From: Jan Kiszka @ 2019-09-10 10:27 UTC (permalink / raw) To: Q. Gylstorff, xenomai On 05.09.19 17:44, Q. Gylstorff wrote: > From: Quirin Gylstorff <quirin.gylstorff@siemens.com> > > To deploy the target with LAVA it is necessary to use a devicetree. > Isar extracts the tree from the kernel build and stores the tree > in the deploy-DIR > > Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> > --- > conf/machine/beagle-bone-black.conf | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/conf/machine/beagle-bone-black.conf b/conf/machine/beagle-bone-black.conf > index 73abe12..90b9f13 100644 > --- a/conf/machine/beagle-bone-black.conf > +++ b/conf/machine/beagle-bone-black.conf > @@ -14,5 +14,6 @@ DISTRO_ARCH = "armhf" > IMAGE_INSTALL += "u-boot-script" > > IMAGE_TYPE ?= "wic-img" > - > +DTB_FILE = "am335x-boneblack.dtb" > IMAGER_INSTALL += "u-boot-omap" > +IMAGE_PREINSTALL += "fake-hwclock" > Patch 3 and 4 should likely come before activating LAVA... I'm taking those two into next already. Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux ^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [xenomai-images][PATCH 4/9] beagle-bone-black: Add Devicetree and fake-hwclock 2019-09-10 10:27 ` Jan Kiszka @ 2019-09-10 11:18 ` Quirin Gylstorff 2019-09-10 14:44 ` [xenomai-images][PATCH v2 0/9] LAVA Setup Q. Gylstorff ` (9 subsequent siblings) 10 siblings, 0 replies; 33+ messages in thread From: Quirin Gylstorff @ 2019-09-10 11:18 UTC (permalink / raw) To: Jan Kiszka, xenomai On 9/10/19 12:27 PM, Jan Kiszka wrote: > On 05.09.19 17:44, Q. Gylstorff wrote: >> From: Quirin Gylstorff <quirin.gylstorff@siemens.com> >> >> To deploy the target with LAVA it is necessary to use a devicetree. >> Isar extracts the tree from the kernel build and stores the tree >> in the deploy-DIR >> >> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> >> --- >> conf/machine/beagle-bone-black.conf | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/conf/machine/beagle-bone-black.conf >> b/conf/machine/beagle-bone-black.conf >> index 73abe12..90b9f13 100644 >> --- a/conf/machine/beagle-bone-black.conf >> +++ b/conf/machine/beagle-bone-black.conf >> @@ -14,5 +14,6 @@ DISTRO_ARCH = "armhf" >> IMAGE_INSTALL += "u-boot-script" >> IMAGE_TYPE ?= "wic-img" >> - >> +DTB_FILE = "am335x-boneblack.dtb" >> IMAGER_INSTALL += "u-boot-omap" >> +IMAGE_PREINSTALL += "fake-hwclock" >> > > Patch 3 and 4 should likely come before activating LAVA... > > I'm taking those two into next already. > OK, I will move them out of the queue. > Jan > Quirin ^ permalink raw reply [flat|nested] 33+ messages in thread
* [xenomai-images][PATCH v2 0/9] LAVA Setup 2019-09-10 10:27 ` Jan Kiszka 2019-09-10 11:18 ` Quirin Gylstorff @ 2019-09-10 14:44 ` Q. Gylstorff 2019-09-10 14:44 ` [xenomai-images][PATCH v2 1/9] ci: Add LAVA jobs for targets Q. Gylstorff ` (8 subsequent siblings) 10 siblings, 0 replies; 33+ messages in thread From: Q. Gylstorff @ 2019-09-10 14:44 UTC (permalink / raw) To: xenomai From: Quirin Gylstorff <quirin.gylstorff@siemens.com> This patchset adapts xenomai-images for the execution of tests on Linaro Automated Validation Architecture. Next steps are: - adding a arm64 hardware target - documentation how to setup a own lab with lava-docker - discussion for a public LAVA master - Add a own repository for the test description instead using inline-testcase Changes: V2: - If Variable LAVA_USER is not set, the stage lava-test is not executed. - incorporate review - rename files - reoder commits - fix check if lava test are sucessful - reoder patches - remove x86-64 nfs patch, already on next - remove beagle-bone Devicetree patch, already on next Quirin Gylstorff (9): ci: Add LAVA jobs for targets ci: Add needs key word machine: Allow override of the image type kas: Use next as target ci: Add inline xenomai testsuite README: correct build line kernel: Update tests/README: Add deployment and Setup tests/README: Add Architecture .gitlab-ci.yml | 106 +++++++++++++++++++-- README.md | 2 +- conf/machine/hikey.conf | 6 +- conf/machine/qemu-arm64.conf | 1 - conf/machine/x86-64-efi.conf | 2 +- opt-latest.yml | 20 ++++ opt-lava-test.yml | 20 ++++ recipes-core/images/demo-image.bb | 2 +- recipes-kernel/linux/files/amd64_defconfig | 2 +- recipes-kernel/linux/linux-xenomai_4.19.bb | 12 ++- scripts/deploy_for_testing.sh | 40 ++++++++ scripts/run-lava-tests.sh | 30 ++++++ tests/README.md | 87 +++++++++++++++++ tests/jobs/xenomai-beaglebone.yml | 76 +++++++++++++++ tests/jobs/xenomai-minnow.yml | 73 ++++++++++++++ tests/jobs/xenomai-qemu-amd64.yml | 87 +++++++++++++++++ tests/jobs/xenomai-qemu-arm64.yml | 96 +++++++++++++++++++ tests/jobs/xenomai-qemu-armhf.yml | 87 +++++++++++++++++ tests/jobs/xenomai-x86-64.yml | 74 ++++++++++++++ 19 files changed, 800 insertions(+), 23 deletions(-) create mode 100644 opt-latest.yml create mode 100644 opt-lava-test.yml create mode 100755 scripts/deploy_for_testing.sh create mode 100755 scripts/run-lava-tests.sh create mode 100644 tests/README.md create mode 100644 tests/jobs/xenomai-beaglebone.yml create mode 100644 tests/jobs/xenomai-minnow.yml create mode 100644 tests/jobs/xenomai-qemu-amd64.yml create mode 100644 tests/jobs/xenomai-qemu-arm64.yml create mode 100644 tests/jobs/xenomai-qemu-armhf.yml create mode 100644 tests/jobs/xenomai-x86-64.yml -- 2.20.1 ^ permalink raw reply [flat|nested] 33+ messages in thread
* [xenomai-images][PATCH v2 1/9] ci: Add LAVA jobs for targets 2019-09-10 10:27 ` Jan Kiszka 2019-09-10 11:18 ` Quirin Gylstorff 2019-09-10 14:44 ` [xenomai-images][PATCH v2 0/9] LAVA Setup Q. Gylstorff @ 2019-09-10 14:44 ` Q. Gylstorff 2019-09-10 14:44 ` [xenomai-images][PATCH v2 2/9] ci: Add needs key word Q. Gylstorff ` (7 subsequent siblings) 10 siblings, 0 replies; 33+ messages in thread From: Q. Gylstorff @ 2019-09-10 14:44 UTC (permalink / raw) To: xenomai From: Quirin Gylstorff <quirin.gylstorff@siemens.com> Set up a LAVA Lab and add jobs for each target. These job descriptions deploy the build image to the target and run the LAVA basic smoketest suite for each target. Add lsb-release for smoke-test Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> --- .gitlab-ci.yml | 94 ++++++++++++++++++++++++++++--- recipes-core/images/demo-image.bb | 2 +- scripts/deploy_for_testing.sh | 40 +++++++++++++ scripts/run-lava-tests.sh | 30 ++++++++++ tests/README.md | 24 ++++++++ tests/jobs/xenomai-beaglebone.yml | 65 +++++++++++++++++++++ tests/jobs/xenomai-minnow.yml | 62 ++++++++++++++++++++ tests/jobs/xenomai-qemu-amd64.yml | 76 +++++++++++++++++++++++++ tests/jobs/xenomai-qemu-arm64.yml | 83 +++++++++++++++++++++++++++ tests/jobs/xenomai-qemu-armhf.yml | 76 +++++++++++++++++++++++++ tests/jobs/xenomai-x86-64.yml | 63 +++++++++++++++++++++ 11 files changed, 607 insertions(+), 8 deletions(-) create mode 100755 scripts/deploy_for_testing.sh create mode 100755 scripts/run-lava-tests.sh create mode 100644 tests/README.md create mode 100644 tests/jobs/xenomai-beaglebone.yml create mode 100644 tests/jobs/xenomai-minnow.yml create mode 100644 tests/jobs/xenomai-qemu-amd64.yml create mode 100644 tests/jobs/xenomai-qemu-arm64.yml create mode 100644 tests/jobs/xenomai-qemu-armhf.yml create mode 100644 tests/jobs/xenomai-x86-64.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index deecfb1..c4dc27f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,37 +1,117 @@ +# +# Xenomai Real-Time System +# +# Copyright (c) Siemens AG, 2019 +# +# Authors: +# Quirin Gylstorff <quirin.gylstorff@siemens.com> +# +# SPDX-License-Identifier: MIT +# +stages: + - build + - lava-test variables: GIT_STRATEGY: clone -variables: http_proxy: "$HTTP_PROXY" https_proxy: "$HTTPS_PROXY" ftp_proxy: "$FTP_PROXY" no_proxy: "$NO_PROXY" +default: + image: kasproject/kas-isar:latest + +# add lavacli to the container and install the ssh keys +# for the test infrastructure +.add-lava-ssh-config: &lava-ssh-key + before_script: + - sudo apt update + - sudo apt install lavacli -y + - mkdir -p -m=700 ~/.ssh + - echo "$LAVA_UPLOAD_KEY" | tr -d '\r' > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa + - echo "ProxyCommand socat - PROXY:$(echo $https_proxy | sed 's|.*://\([^:]*\).*|\1|'):%h:%p,proxyport=$(echo $https_proxy | sed 's|.*:\([0-9]*\)$|\1|')" >> ~/.ssh/config && chmod 600 ~/.ssh/config + - echo "$LAVA_KNOWN_HOST" >> ~/.ssh/known_hosts && chmod 644 ~/.ssh/known_hosts + build:qemu-amd64: + <<: *lava-ssh-key stage: build - image: kasproject/kas-isar:latest script: - kas build kas.yml:board-qemu-amd64.yml + - scripts/deploy_for_testing.sh qemu-amd64 + +lava-test:qemu-amd64: + <<: *lava-ssh-key + stage: lava-test + script: + - scripts/run-lava-tests.sh qemu-amd64 + only: + variables: + - $LAVA_USER + build:qemu-armhf: stage: build - image: kasproject/kas-isar:latest script: - kas build kas.yml:board-qemu-armhf.yml + - scripts/deploy_for_testing.sh qemu-armhf + +lava-test:qemu-armhf: + <<: *lava-ssh-key + stage: lava-test + script: + - scripts/run-lava-tests.sh qemu-armhf + only: + variables: + - $LAVA_USER + build:qemu-arm64: + <<: *lava-ssh-key stage: build - image: kasproject/kas-isar:latest script: - kas build kas.yml:board-qemu-arm64.yml + - scripts/deploy_for_testing.sh qemu-arm64 + +lava-test:qemu-arm64: + <<: *lava-ssh-key + stage: lava-test + script: + - scripts/run-lava-tests.sh qemu-arm64 + only: + variables: + - $LAVA_USER + build:board-hikey: stage: build - image: kasproject/kas-isar:latest script: - kas build kas.yml:board-hikey.yml +# hikey is currently not part of the testlab + build:board-beaglebone: + <<: *lava-ssh-key stage: build - image: kasproject/kas-isar:latest script: - kas build kas.yml:board-beagle-bone-black.yml + - scripts/deploy_for_testing.sh beagle-bone-black + +lava-test:board-beaglebone: + <<: *lava-ssh-key + stage: lava-test + script: + - scripts/run-lava-tests.sh beaglebone + only: + variables: + - $LAVA_USER + build:board-x86-64-efi: + <<: *lava-ssh-key stage: build - image: kasproject/kas-isar:latest script: - kas build kas.yml:board-x86-64-efi.yml + - scripts/deploy_for_testing.sh x86-64-efi + +lava-test:board-x86-64-efi: + <<: *lava-ssh-key + stage: lava-test + script: + - scripts/run-lava-tests.sh x86-64 + only: + variables: + - $LAVA_USER diff --git a/recipes-core/images/demo-image.bb b/recipes-core/images/demo-image.bb index 8afad67..02976fa 100644 --- a/recipes-core/images/demo-image.bb +++ b/recipes-core/images/demo-image.bb @@ -18,7 +18,7 @@ IMAGE_PREINSTALL += " \ bash-completion less vim nano man \ ifupdown isc-dhcp-client net-tools iputils-ping ssh \ iw wireless-tools wpasupplicant \ - gdb" + gdb lsb-release" IMAGE_INSTALL += "xenomai-runtime" IMAGE_INSTALL += "customizations expand-on-first-boot" diff --git a/scripts/deploy_for_testing.sh b/scripts/deploy_for_testing.sh new file mode 100755 index 0000000..1414d63 --- /dev/null +++ b/scripts/deploy_for_testing.sh @@ -0,0 +1,40 @@ +#!/bin/sh + +# +# Xenomai Real-Time System +# +# Copyright (c) Siemens AG, 2019 +# +# Authors: +# Quirin Gylstorff <quirin.gylstorff@siemens.com> +# +# SPDX-License-Identifier: MIT +# +set -e +TARGET="$1" + +if [ -z "${TARGET}" ]; then + exit -1 +fi +IMAGES_DIR=build/tmp/deploy/images + +if [ -z "${LAVA_USER}" ] || [ -z "${LAVA_HOST}" ] || [ -z "${LAVA_PORT}" ]; then + echo "Lava environment not available or incomplete - do not deploy" + exit 0 +fi + +LAVA_MASTER="${LAVA_USER}@${LAVA_HOST}" +#KERNEL +scp -P ${LAVA_PORT} ${IMAGES_DIR}/${TARGET}/demo-image-xenomai-demo-${TARGET}-vmlinuz \ + ${LAVA_MASTER}:/var/lib/lava/artifacts +# INITRD +scp -P ${LAVA_PORT} ${IMAGES_DIR}/${TARGET}/demo-image-xenomai-demo-${TARGET}-initrd.img \ + ${LAVA_MASTER}:/var/lib/lava/artifacts +# ROOTFS +scp -P ${LAVA_PORT} ${IMAGES_DIR}/${TARGET}/demo-image-xenomai-demo-${TARGET}.* \ + ${LAVA_MASTER}:/var/lib/lava/artifacts +# DTB +DTB="${IMAGES_DIR}/${TARGET}/*.dtb" +if [ -e ${DTB} ]; then + scp -P ${LAVA_PORT} ${DTB} ${LAVA_MASTER}:/var/lib/lava/artifacts +fi diff --git a/scripts/run-lava-tests.sh b/scripts/run-lava-tests.sh new file mode 100755 index 0000000..edd2a20 --- /dev/null +++ b/scripts/run-lava-tests.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# +# Xenomai Real-Time System +# +# Copyright (c) Siemens AG, 2019 +# +# Authors: +# Quirin Gylstorff <quirin.gylstorff@siemens.com> +# +# SPDX-License-Identifier: MIT +# +set -e +TARGET=$1 + +LAVA_MASTER="${LAVA_USER}@${LAVA_HOST}" + +# open connection for ssh port forwarding +ssh -N -p ${LAVA_PORT} -o 'LocalForward localhost:28080 localhost:80' ${LAVA_MASTER} & + +# connect to lava master +lavacli identities add --token ${LAVA_TOKEN} --uri http://localhost:28080 --username siemens default + +test_id=$(lavacli jobs submit tests/jobs/xenomai-${TARGET}.yml) +lavacli jobs logs ${test_id} +lavacli results ${test_id} +# change return code to generate a error in gitlab-ci if a test is failed +number_of_fails=$(lavacli results ${test_id} | grep fail | wc -l) +if [ "${number_of_fails}" -gt "0" ]; then + exit 1 +fi diff --git a/tests/README.md b/tests/README.md new file mode 100644 index 0000000..c7e2030 --- /dev/null +++ b/tests/README.md @@ -0,0 +1,24 @@ +# Testing + +For image testing this project uses the +[Linaro Automated Validation Architecture(LAVA)](https://www.lavasoftware.org/). +The images are generate a gitlab-ci pipeline. This pipline builds the images and +sends them to the lava testlab. + +## Test targets + +following images are test: +- qemu-arm64 +- qemu-amd64 +- x86-64-efi +- beagle-bone-black + +## Tests + +Currently the following tests are executed on each target: +- lava-smoketest + +### lava-smoketest + +The lava smoke tests are part of http://git.linaro.org/lava-team/lava-functional-tests.git +and check machine data from the target. diff --git a/tests/jobs/xenomai-beaglebone.yml b/tests/jobs/xenomai-beaglebone.yml new file mode 100644 index 0000000..231c5d0 --- /dev/null +++ b/tests/jobs/xenomai-beaglebone.yml @@ -0,0 +1,65 @@ +# +# Xenomai Real-Time System +# +# Copyright (c) Siemens AG, 2019 +# +# Authors: +# Quirin Gylstorff <quirin.gylstorff@siemens.com> +# +# SPDX-License-Identifier: MIT +# +job_name: xenomai-test-suite +device_type: beaglebone-black + +timeouts: + job: + minutes: 30 + action: + minutes: 20 + connection: + minutes: 2 +priority: medium +visibility: public + +metadata: + # please change these fields when modifying this job for your own tests. + docs-source: xenomai-beagleboneblack + docs-filename: pipeline-xenomai-beagleboneblack +context: + console_device: ttyO + baud_rate: 115200 +# ACTION_BLOCK +actions: +- deploy: + timeout: + minutes: 5 + to: tftp + kernel: + url: http://localhost/artifacts/demo-image-xenomai-demo-beagle-bone-black-vmlinuz + type: zimage + dtb: + url: http://localhost/artifacts/am335x-boneblack.dtb + nfsrootfs: + url: http://localhost/artifacts/demo-image-xenomai-demo-beagle-bone-black.tar.gz + compression: gz +# BOOT_BLOCK +- boot: + timeout: + minutes: 5 + method: u-boot + commands: nfs + prompts: ["root@demo:"] + auto_login: + login_prompt: 'demo login:' + username: root + password_prompt: 'Password:' + password: root + +- test: + timeout: + minutes: 30 + definitions: + - repository: http://git.linaro.org/lava-team/lava-functional-tests.git + from: git + path: lava-test-shell/smoke-tests-basic.yaml + name: smoke-tests diff --git a/tests/jobs/xenomai-minnow.yml b/tests/jobs/xenomai-minnow.yml new file mode 100644 index 0000000..d60628d --- /dev/null +++ b/tests/jobs/xenomai-minnow.yml @@ -0,0 +1,62 @@ +# +# Xenomai Real-Time System +# +# Copyright (c) Siemens AG, 2019 +# +# Authors: +# Quirin Gylstorff <quirin.gylstorff@siemens.com> +# +# SPDX-License-Identifier: MIT +# +job_name: xenomai-test-suite +device_type: minnowboard-max-E3825 +timeouts: + job: + minutes: 30 + action: + minutes: 20 + connection: + minutes: 2 +priority: medium +visibility: public + +metadata: + # please change these fields when modifying this job for your own tests. + docs-source: xenomai-cof + docs-filename: pipeline-xenomai-cof +# ACTION_BLOCK +actions: +- deploy: + timeout: + minutes: 5 + to: tftp + kernel: + url: http://localhost/artifacts/demo-image-xenomai-demo-x86-64-efi-vmlinuz + type: bzimage + ramdisk: + url: http://localhost/artifacts/demo-image-xenomai-demo-x86-64-efi-initrd.img + compression: gz + nfsrootfs: + url: http://localhost/artifacts/demo-image-xenomai-demo-x86-64-efi.tar.gz + compression: gz +# BOOT_BLOCK +- boot: + timeout: + minutes: 5 + method: grub + commands: nfs + prompts: ["root@demo:"] + auto_login: + login_prompt: 'demo login:' + username: root + password_prompt: 'Password:' + password: root + +- test: + timeout: + minutes: 30 + definitions: + - repository: http://git.linaro.org/lava-team/lava-functional-tests.git + from: git + path: lava-test-shell/smoke-tests-basic.yaml + name: smoke-tests diff --git a/tests/jobs/xenomai-qemu-amd64.yml b/tests/jobs/xenomai-qemu-amd64.yml new file mode 100644 index 0000000..12f4c7f --- /dev/null +++ b/tests/jobs/xenomai-qemu-amd64.yml @@ -0,0 +1,76 @@ +# +# Xenomai Real-Time System +# +# Copyright (c) Siemens AG, 2019 +# +# Authors: +# Quirin Gylstorff <quirin.gylstorff@siemens.com> +# +# SPDX-License-Identifier: MIT +# +device_type: qemu +job_name: QEMU pipeline, xenomai-images-qemu-amd64 + +timeouts: + job: + minutes: 15 + action: + minutes: 5 + connection: + minutes: 2 +priority: medium +visibility: public + +# context allows specific values to be overridden or included +context: + # tell the qemu template which architecture is being tested + # the template uses that to ensure that qemu-system-x86_64 is executed. + arch: amd64 + extra_options: + - -smp + - 4 + - -nographic + - -enable-kvm + - -machine q35 + - -device ide-hd,drive=disk +metadata: + # please change these fields when modifying this job for your own tests. + docs-source: xenomai-qemu-amd64 + docs-filename: qemu-pipeline-xenomai-amd64 + +# ACTION_BLOCK +actions: +- deploy: + timeout: + minutes: 5 + to: tmpfs + images: + kernel: + image_arg: -kernel {kernel} -append "root=/dev/sdb console=ttyS0,115200 console=tty0" + url: http://localhost/artifacts/demo-image-xenomai-demo-qemu-amd64-vmlinuz + initrd: + image_arg: -initrd {initrd} + url: http://localhost/artifacts/demo-image-xenomai-demo-qemu-amd64-initrd.img + rootfs: + image_arg: -drive file={rootfs},discard=unmap,if=none,id=disk,format=raw + url: http://localhost/artifacts/demo-image-xenomai-demo-qemu-amd64.ext4.img + +# BOOT_BLOCK +- boot: + timeout: + minutes: 2 + method: qemu + media: tmpfs + prompts: ["root@demo:"] + auto_login: + login_prompt: 'demo login:' + username: root + password_prompt: 'Password:' + password: root + +- test: + definitions: + - repository: http://git.linaro.org/lava-team/lava-functional-tests.git + from: git + path: lava-test-shell/smoke-tests-basic.yaml + name: smoke-tests diff --git a/tests/jobs/xenomai-qemu-arm64.yml b/tests/jobs/xenomai-qemu-arm64.yml new file mode 100644 index 0000000..fceee0c --- /dev/null +++ b/tests/jobs/xenomai-qemu-arm64.yml @@ -0,0 +1,83 @@ +# +# Xenomai Real-Time System +# +# Copyright (c) Siemens AG, 2019 +# +# Authors: +# Quirin Gylstorff <quirin.gylstorff@siemens.com> +# +# SPDX-License-Identifier: MIT +# +device_type: qemu +job_name: QEMU pipeline, xenomai-images-qemu-arm64 + +timeouts: + job: + minutes: 15 + action: + minutes: 5 + connection: + minutes: 2 +priority: medium +visibility: public + +# context allows specific values to be overridden or included +context: + # tell the qemu template which architecture is being tested + # the template uses that to ensure that qemu-system-x86_64 is executed. + arch: arm64 + extra_options: + - -global + - virtio-blk-device.scsi=off + - -smp + - 4 + - -device + - virtio-serial-device + - -device + - virtconsole,chardev=con + - -chardev + - vc,id=con + - -device + - virtio-blk-device,drive=disk + guestfs_interface: virtio +metadata: + # please change these fields when modifying this job for your own tests. + docs-source: xenomai-qemu-arm64 + docs-filename: qemu-pipeline-xenomai-arm64 + +# ACTION_BLOCK +actions: +- deploy: + timeout: + minutes: 5 + to: tmpfs + images: + kernel: + image_arg: -kernel {kernel} -append "root=/dev/vda" + url: http://localhost/artifacts/demo-image-xenomai-demo-qemu-arm64-vmlinuz + initrd: + image_arg: -initrd {initrd} + url: http://localhost/artifacts/demo-image-xenomai-demo-qemu-arm64-initrd.img + rootfs: + image_arg: -drive file={rootfs},discard=unmap,if=none,id=disk,format=raw + url: http://localhost/artifacts/demo-image-xenomai-demo-qemu-arm64.ext4.img + +# BOOT_BLOCK +- boot: + timeout: + minutes: 2 + method: qemu + media: tmpfs + prompts: ["root@demo:"] + auto_login: + login_prompt: 'demo login:' + username: root + password_prompt: 'Password:' + password: root + +- test: + definitions: + - repository: http://git.linaro.org/lava-team/lava-functional-tests.git + from: git + path: lava-test-shell/smoke-tests-basic.yaml + name: smoke-tests diff --git a/tests/jobs/xenomai-qemu-armhf.yml b/tests/jobs/xenomai-qemu-armhf.yml new file mode 100644 index 0000000..d6603af --- /dev/null +++ b/tests/jobs/xenomai-qemu-armhf.yml @@ -0,0 +1,76 @@ +# +# Xenomai Real-Time System +# +# Copyright (c) Siemens AG, 2019 +# +# Authors: +# Quirin Gylstorff <quirin.gylstorff@siemens.com> +# +# SPDX-License-Identifier: MIT +# +device_type: qemu +job_name: QEMU pipeline, xenomai-images-qemu-armhf + +timeouts: + job: + minutes: 15 + action: + minutes: 5 + connection: + minutes: 2 +priority: medium +visibility: public + +# context allows specific values to be overridden or included +context: + arch: arm + cpu: cortex-a15 + extra_options: + - -smp 4 + - -device virtio-serial-device + - -device virtconsole,chardev=con + - -chardev vc,id=con + - -device virtio-blk-device,bootindex=0,drive=disk + - -device virtio-blk-device,bootindex=1,drive=lavatest + guestfs_interface: none +metadata: + # please change these fields when modifying this job for your own tests. + docs-source: xenomai-qemu-armhf + docs-filename: qemu-pipeline-xenomai-armhf + +# ACTION_BLOCK +actions: +- deploy: + timeout: + minutes: 5 + to: tmpfs + images: + kernel: + image_arg: -kernel {kernel} -append "root=/dev/vdb" + url: http://localhost/artifacts/demo-image-xenomai-demo-qemu-armhf-vmlinuz + initrd: + image_arg: -initrd {initrd} + url: http://localhost/artifacts/demo-image-xenomai-demo-qemu-armhf-initrd.img + rootfs: + image_arg: -drive file={rootfs},discard=unmap,if=none,id=disk,format=raw + url: http://localhost/artifacts/demo-image-xenomai-demo-qemu-armhf.ext4.img + +# BOOT_BLOCK +- boot: + timeout: + minutes: 5 + method: qemu + media: tmpfs + prompts: ["root@demo:"] + auto_login: + login_prompt: 'demo login:' + username: root + password_prompt: 'Password:' + password: root + +- test: + definitions: + - repository: http://git.linaro.org/lava-team/lava-functional-tests.git + from: git + path: lava-test-shell/smoke-tests-basic.yaml + name: smoke-tests diff --git a/tests/jobs/xenomai-x86-64.yml b/tests/jobs/xenomai-x86-64.yml new file mode 100644 index 0000000..0fb3ea8 --- /dev/null +++ b/tests/jobs/xenomai-x86-64.yml @@ -0,0 +1,63 @@ +# +# Xenomai Real-Time System +# +# Copyright (c) Siemens AG, 2019 +# +# Authors: +# Quirin Gylstorff <quirin.gylstorff@siemens.com> +# +# SPDX-License-Identifier: MIT +# +job_name: xenomai-test-suite +device_type: x86 + +timeouts: + job: + minutes: 30 + action: + minutes: 20 + connection: + minutes: 2 +priority: medium +visibility: public + +metadata: + # please change these fields when modifying this job for your own tests. + docs-source: xenomai-cof + docs-filename: pipeline-xenomai-cof +# ACTION_BLOCK +actions: +- deploy: + timeout: + minutes: 5 + to: tftp + kernel: + url: http://localhost/artifacts/demo-image-xenomai-demo-x86-64-efi-vmlinuz + type: bzimage + ramdisk: + url: http://localhost/artifacts/demo-image-xenomai-demo-x86-64-efi-initrd.img + compression: gz + nfsrootfs: + url: http://localhost/artifacts/demo-image-xenomai-demo-x86-64-efi.tar.gz + compression: gz +# BOOT_BLOCK +- boot: + timeout: + minutes: 5 + method: ipxe + commands: nfs + prompts: ["root@demo:"] + auto_login: + login_prompt: 'demo login:' + username: root + password_prompt: 'Password:' + password: root + +- test: + timeout: + minutes: 30 + definitions: + - repository: http://git.linaro.org/lava-team/lava-functional-tests.git + from: git + path: lava-test-shell/smoke-tests-basic.yaml + name: smoke-tests -- 2.20.1 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* [xenomai-images][PATCH v2 2/9] ci: Add needs key word 2019-09-10 10:27 ` Jan Kiszka ` (2 preceding siblings ...) 2019-09-10 14:44 ` [xenomai-images][PATCH v2 1/9] ci: Add LAVA jobs for targets Q. Gylstorff @ 2019-09-10 14:44 ` Q. Gylstorff 2019-09-10 14:44 ` [xenomai-images][PATCH v2 3/9] machine: Allow override of the image type Q. Gylstorff ` (6 subsequent siblings) 10 siblings, 0 replies; 33+ messages in thread From: Q. Gylstorff @ 2019-09-10 14:44 UTC (permalink / raw) To: xenomai From: Quirin Gylstorff <quirin.gylstorff@siemens.com> The keyword "needs" was introduced in gitlab 12.2 and allows the creation of Directed Asylic Graph. This allows to execute tests without waiting for the complete build. Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> --- .gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c4dc27f..c75a7e6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,7 @@ stages: - build - lava-test + variables: GIT_STRATEGY: clone http_proxy: "$HTTP_PROXY" @@ -43,6 +44,7 @@ lava-test:qemu-amd64: stage: lava-test script: - scripts/run-lava-tests.sh qemu-amd64 + needs: [ "build:qemu-amd64" ] only: variables: - $LAVA_USER @@ -58,6 +60,7 @@ lava-test:qemu-armhf: stage: lava-test script: - scripts/run-lava-tests.sh qemu-armhf + needs: [ "build:qemu-armhf" ] only: variables: - $LAVA_USER @@ -74,6 +77,7 @@ lava-test:qemu-arm64: stage: lava-test script: - scripts/run-lava-tests.sh qemu-arm64 + needs: [ "build:qemu-arm64" ] only: variables: - $LAVA_USER @@ -96,6 +100,7 @@ lava-test:board-beaglebone: stage: lava-test script: - scripts/run-lava-tests.sh beaglebone + needs: [ "build:board-beaglebone" ] only: variables: - $LAVA_USER @@ -112,6 +117,7 @@ lava-test:board-x86-64-efi: stage: lava-test script: - scripts/run-lava-tests.sh x86-64 + needs: [ "build:board-x86-64-efi" ] only: variables: - $LAVA_USER -- 2.20.1 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* [xenomai-images][PATCH v2 3/9] machine: Allow override of the image type 2019-09-10 10:27 ` Jan Kiszka ` (3 preceding siblings ...) 2019-09-10 14:44 ` [xenomai-images][PATCH v2 2/9] ci: Add needs key word Q. Gylstorff @ 2019-09-10 14:44 ` Q. Gylstorff 2019-09-10 14:44 ` [xenomai-images][PATCH v2 4/9] kas: Use next as target Q. Gylstorff ` (5 subsequent siblings) 10 siblings, 0 replies; 33+ messages in thread From: Q. Gylstorff @ 2019-09-10 14:44 UTC (permalink / raw) To: xenomai From: Quirin Gylstorff <quirin.gylstorff@siemens.com> For the NFS rootfs a tarball is used. This changes allows local.conf to set the IMAGE_TYPE from wic-img to targz-img. Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> --- .gitlab-ci.yml | 4 ++-- conf/machine/hikey.conf | 2 +- conf/machine/x86-64-efi.conf | 2 +- opt-lava-test.yml | 20 ++++++++++++++++++++ 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 opt-lava-test.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c75a7e6..ace8862 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -92,7 +92,7 @@ build:board-beaglebone: <<: *lava-ssh-key stage: build script: - - kas build kas.yml:board-beagle-bone-black.yml + - kas build kas.yml:board-beagle-bone-black.yml:opt-lava-test.yml - scripts/deploy_for_testing.sh beagle-bone-black lava-test:board-beaglebone: @@ -109,7 +109,7 @@ build:board-x86-64-efi: <<: *lava-ssh-key stage: build script: - - kas build kas.yml:board-x86-64-efi.yml + - kas build kas.yml:board-x86-64-efi.yml:opt-lava-test.yml - scripts/deploy_for_testing.sh x86-64-efi lava-test:board-x86-64-efi: diff --git a/conf/machine/hikey.conf b/conf/machine/hikey.conf index 465e06e..3c93507 100644 --- a/conf/machine/hikey.conf +++ b/conf/machine/hikey.conf @@ -11,7 +11,7 @@ DISTRO_ARCH = "arm64" -IMAGE_TYPE = "wic-img" +IMAGE_TYPE ?= "wic-img" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" PREFERRED_VERSION_linux-xenomai = "4.14.%" diff --git a/conf/machine/x86-64-efi.conf b/conf/machine/x86-64-efi.conf index 0fd2ef1..02846ff 100644 --- a/conf/machine/x86-64-efi.conf +++ b/conf/machine/x86-64-efi.conf @@ -11,5 +11,5 @@ DISTRO_ARCH = "amd64" -IMAGE_TYPE = "wic-img" +IMAGE_TYPE ?= "wic-img" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" diff --git a/opt-lava-test.yml b/opt-lava-test.yml new file mode 100644 index 0000000..206aea0 --- /dev/null +++ b/opt-lava-test.yml @@ -0,0 +1,20 @@ +# +# Xenomai Real-Time System +# +# Copyright (c) Siemens AG, 2019 +# +# Authors: +# Quirin Gylstorff <quirin.gylstorff@siemens.com> +# +# SPDX-License-Identifier: MIT +# + +header: + version: 8 + +# lava uses nfs to deploy the image. For this we need a tarball instead of +# full image + +local_conf_header: + image-type: | + IMAGE_TYPE = "targz-img" -- 2.20.1 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* [xenomai-images][PATCH v2 4/9] kas: Use next as target 2019-09-10 10:27 ` Jan Kiszka ` (4 preceding siblings ...) 2019-09-10 14:44 ` [xenomai-images][PATCH v2 3/9] machine: Allow override of the image type Q. Gylstorff @ 2019-09-10 14:44 ` Q. Gylstorff 2019-09-10 14:44 ` [xenomai-images][PATCH v2 5/9] ci: Add inline xenomai testsuite Q. Gylstorff ` (4 subsequent siblings) 10 siblings, 0 replies; 33+ messages in thread From: Q. Gylstorff @ 2019-09-10 14:44 UTC (permalink / raw) To: xenomai From: Quirin Gylstorff <quirin.gylstorff@siemens.com> For CI testing of the next branch. Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> --- .gitlab-ci.yml | 6 +++--- opt-latest.yml | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 opt-latest.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ace8862..0e1d21a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,14 +85,14 @@ lava-test:qemu-arm64: build:board-hikey: stage: build script: - - kas build kas.yml:board-hikey.yml + - kas build kas.yml:board-hikey.yml:opt-latest.yml # hikey is currently not part of the testlab build:board-beaglebone: <<: *lava-ssh-key stage: build script: - - kas build kas.yml:board-beagle-bone-black.yml:opt-lava-test.yml + - kas build kas.yml:board-beagle-bone-black.yml:opt-latest.yml:opt-lava-test.yml - scripts/deploy_for_testing.sh beagle-bone-black lava-test:board-beaglebone: @@ -109,7 +109,7 @@ build:board-x86-64-efi: <<: *lava-ssh-key stage: build script: - - kas build kas.yml:board-x86-64-efi.yml:opt-lava-test.yml + - kas build kas.yml:board-x86-64-efi.yml:opt-latest.yml:opt-lava-test.yml - scripts/deploy_for_testing.sh x86-64-efi lava-test:board-x86-64-efi: diff --git a/opt-latest.yml b/opt-latest.yml new file mode 100644 index 0000000..94381bd --- /dev/null +++ b/opt-latest.yml @@ -0,0 +1,20 @@ +# +# Xenomai Real-Time System +# +# Copyright (c) Siemens AG, 2019 +# +# Authors: +# Quirin Gylstorff <quirin.gylstorff@siemens.com> +# +# SPDX-License-Identifier: MIT +# + +header: + version: 8 + +# lava uses nfs to deploy the image. For this we need a tarball instead of +# full image + +local_conf_header: + xenomai-latest: | + PREFERRED_VERSION_xenomai = "next" -- 2.20.1 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* [xenomai-images][PATCH v2 5/9] ci: Add inline xenomai testsuite 2019-09-10 10:27 ` Jan Kiszka ` (5 preceding siblings ...) 2019-09-10 14:44 ` [xenomai-images][PATCH v2 4/9] kas: Use next as target Q. Gylstorff @ 2019-09-10 14:44 ` Q. Gylstorff 2019-09-10 14:44 ` [xenomai-images][PATCH v2 6/9] README: correct build line Q. Gylstorff ` (3 subsequent siblings) 10 siblings, 0 replies; 33+ messages in thread From: Q. Gylstorff @ 2019-09-10 14:44 UTC (permalink / raw) To: xenomai From: Quirin Gylstorff <quirin.gylstorff@siemens.com> Add the inline test definition to execute xeno-test for the images. Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> --- tests/README.md | 5 +++++ tests/jobs/xenomai-beaglebone.yml | 11 +++++++++++ tests/jobs/xenomai-minnow.yml | 11 +++++++++++ tests/jobs/xenomai-qemu-amd64.yml | 11 +++++++++++ tests/jobs/xenomai-qemu-arm64.yml | 13 +++++++++++++ tests/jobs/xenomai-qemu-armhf.yml | 11 +++++++++++ tests/jobs/xenomai-x86-64.yml | 11 +++++++++++ 7 files changed, 73 insertions(+) diff --git a/tests/README.md b/tests/README.md index c7e2030..f107607 100644 --- a/tests/README.md +++ b/tests/README.md @@ -17,8 +17,13 @@ following images are test: Currently the following tests are executed on each target: - lava-smoketest +- xenomai-test-suite ### lava-smoketest The lava smoke tests are part of http://git.linaro.org/lava-team/lava-functional-tests.git and check machine data from the target. + +### xenomai-test-suite + +The xenomai test suite executes the xeno-test tool from xenomai/testsuite. diff --git a/tests/jobs/xenomai-beaglebone.yml b/tests/jobs/xenomai-beaglebone.yml index 231c5d0..85f2b88 100644 --- a/tests/jobs/xenomai-beaglebone.yml +++ b/tests/jobs/xenomai-beaglebone.yml @@ -63,3 +63,14 @@ actions: from: git path: lava-test-shell/smoke-tests-basic.yaml name: smoke-tests + - repository: + metadata: + format: Lava-Test Test Definition 1.0 + name: xenomai-test-suite + description: "runs the xenomai test suite" + run: + steps: + - lava-test-case xenomai-test --shell xeno-test -k -l \"dohell -m /tmp 300\" -p 1000 + from: inline + path: inline/xenomai-test-suite.yaml + name: xenomai-test-suite diff --git a/tests/jobs/xenomai-minnow.yml b/tests/jobs/xenomai-minnow.yml index d60628d..dcdcc28 100644 --- a/tests/jobs/xenomai-minnow.yml +++ b/tests/jobs/xenomai-minnow.yml @@ -60,3 +60,14 @@ actions: from: git path: lava-test-shell/smoke-tests-basic.yaml name: smoke-tests + - repository: + metadata: + format: Lava-Test Test Definition 1.0 + name: xenomai-test-suite + description: "runs the xenomai test suite" + run: + steps: + - lava-test-case xenomai-test --shell xeno-test -k -l \"dohell -m /tmp 300\" -p 1000 + from: inline + path: inline/xenomai-test-suite.yaml + name: xenomai-test-suite diff --git a/tests/jobs/xenomai-qemu-amd64.yml b/tests/jobs/xenomai-qemu-amd64.yml index 12f4c7f..2976f89 100644 --- a/tests/jobs/xenomai-qemu-amd64.yml +++ b/tests/jobs/xenomai-qemu-amd64.yml @@ -74,3 +74,14 @@ actions: from: git path: lava-test-shell/smoke-tests-basic.yaml name: smoke-tests + - repository: + metadata: + format: Lava-Test Test Definition 1.0 + name: xenomai-test-suite + description: "runs the xenomai test suite" + run: + steps: + - lava-test-case xenomai-test --shell xeno-test -k + from: inline + path: inline/xenomai-test-suite.yaml + name: xenomai-test-suite diff --git a/tests/jobs/xenomai-qemu-arm64.yml b/tests/jobs/xenomai-qemu-arm64.yml index fceee0c..8ba4575 100644 --- a/tests/jobs/xenomai-qemu-arm64.yml +++ b/tests/jobs/xenomai-qemu-arm64.yml @@ -81,3 +81,16 @@ actions: from: git path: lava-test-shell/smoke-tests-basic.yaml name: smoke-tests + - repository: + metadata: + format: Lava-Test Test Definition 1.0 + name: xenomai-test-suite + description: "runs the xenomai smokey test suite" + maintainer: + - quirin.gylstorff@siemens.org + run: + steps: + - lava-test-case xenomai-smokey --shell xeno-test -k + from: inline + path: inline/xenomai-test-suite.yaml + name: xenomai-test-suite diff --git a/tests/jobs/xenomai-qemu-armhf.yml b/tests/jobs/xenomai-qemu-armhf.yml index d6603af..238265b 100644 --- a/tests/jobs/xenomai-qemu-armhf.yml +++ b/tests/jobs/xenomai-qemu-armhf.yml @@ -74,3 +74,14 @@ actions: from: git path: lava-test-shell/smoke-tests-basic.yaml name: smoke-tests + - repository: + metadata: + format: Lava-Test Test Definition 1.0 + name: xenomai-test-suite + description: "runs the xenomai test suite" + run: + steps: + - lava-test-case xenomai-test --shell xeno-test -k + from: inline + path: inline/xenomai-test-suite.yaml + name: xenomai-test-suite diff --git a/tests/jobs/xenomai-x86-64.yml b/tests/jobs/xenomai-x86-64.yml index 0fb3ea8..9d58c45 100644 --- a/tests/jobs/xenomai-x86-64.yml +++ b/tests/jobs/xenomai-x86-64.yml @@ -61,3 +61,14 @@ actions: from: git path: lava-test-shell/smoke-tests-basic.yaml name: smoke-tests + - repository: + metadata: + format: Lava-Test Test Definition 1.0 + name: xenomai-test-suite + description: "runs the xenomai test suite" + run: + steps: + - lava-test-case xenomai-test --shell xeno-test -k -l \"dohell -m /tmp 300\" -p 1000 + from: inline + path: inline/xenomai-test-suite.yaml + name: xenomai-test-suite -- 2.20.1 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* [xenomai-images][PATCH v2 6/9] README: correct build line 2019-09-10 10:27 ` Jan Kiszka ` (6 preceding siblings ...) 2019-09-10 14:44 ` [xenomai-images][PATCH v2 5/9] ci: Add inline xenomai testsuite Q. Gylstorff @ 2019-09-10 14:44 ` Q. Gylstorff 2019-09-10 14:44 ` [xenomai-images][PATCH v2 7/9] kernel: Update Q. Gylstorff ` (2 subsequent siblings) 10 siblings, 0 replies; 33+ messages in thread From: Q. Gylstorff @ 2019-09-10 14:44 UTC (permalink / raw) To: xenomai From: Quirin Gylstorff <quirin.gylstorff@siemens.com> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f65eac7..5b84983 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ To execute the CI build use: ``` gitlab-runner exec docker --docker-privileged \ --env "HTTP_PROXY=$HTTP_PROXY" --env "HTTPS_PROXY=$HTTPS_PROXY" \ - --env "NO_PROXY=$NO_PROXY" build:armhf + --env "NO_PROXY=$NO_PROXY" build:qemu-armhf ``` ## Community Resources -- 2.20.1 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* [xenomai-images][PATCH v2 7/9] kernel: Update 2019-09-10 10:27 ` Jan Kiszka ` (7 preceding siblings ...) 2019-09-10 14:44 ` [xenomai-images][PATCH v2 6/9] README: correct build line Q. Gylstorff @ 2019-09-10 14:44 ` Q. Gylstorff 2019-09-10 16:52 ` Jan Kiszka 2019-09-10 14:44 ` [xenomai-images][PATCH v2 8/9] tests/README: Add deployment and Setup Q. Gylstorff 2019-09-10 14:44 ` [xenomai-images][PATCH v2 9/9] tests/README: Add Architecture Q. Gylstorff 10 siblings, 1 reply; 33+ messages in thread From: Q. Gylstorff @ 2019-09-10 14:44 UTC (permalink / raw) To: xenomai From: Quirin Gylstorff <quirin.gylstorff@siemens.com> Update amd64 to new released kernel versions. Remove arm64 pinning to 4.14. Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> --- conf/machine/hikey.conf | 4 +--- conf/machine/qemu-arm64.conf | 1 - recipes-kernel/linux/files/amd64_defconfig | 2 +- recipes-kernel/linux/linux-xenomai_4.19.bb | 12 ++++++++---- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/conf/machine/hikey.conf b/conf/machine/hikey.conf index 3c93507..11cf635 100644 --- a/conf/machine/hikey.conf +++ b/conf/machine/hikey.conf @@ -14,8 +14,6 @@ DISTRO_ARCH = "arm64" IMAGE_TYPE ?= "wic-img" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" -PREFERRED_VERSION_linux-xenomai = "4.14.%" - IMAGE_PREINSTALL_append = " firmware-ti-connectivity" -PREFERRED_VERSION_xenomai = "next" \ No newline at end of file +PREFERRED_VERSION_xenomai = "next" diff --git a/conf/machine/qemu-arm64.conf b/conf/machine/qemu-arm64.conf index 9e1d984..472f619 100644 --- a/conf/machine/qemu-arm64.conf +++ b/conf/machine/qemu-arm64.conf @@ -13,4 +13,3 @@ require qemu-machine.inc DISTRO_ARCH = "arm64" PREFERRED_VERSION_xenomai = "next" -PREFERRED_VERSION_linux-xenomai = "4.14.%" diff --git a/recipes-kernel/linux/files/amd64_defconfig b/recipes-kernel/linux/files/amd64_defconfig index cba31a5..9faed52 100644 --- a/recipes-kernel/linux/files/amd64_defconfig +++ b/recipes-kernel/linux/files/amd64_defconfig @@ -3953,7 +3953,7 @@ CONFIG_TRACING_EVENTS_GPIO=y # CONFIG_TEST_KMOD is not set # CONFIG_TEST_DEBUG_VIRTUAL is not set # CONFIG_MEMTEST is not set -# CONFIG_BUG_ON_DATA_CORRUPTION is not set +CONFIG_BUG_ON_DATA_CORRUPTION=y # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y CONFIG_KGDB=y diff --git a/recipes-kernel/linux/linux-xenomai_4.19.bb b/recipes-kernel/linux/linux-xenomai_4.19.bb index 9af5659..5137319 100644 --- a/recipes-kernel/linux/linux-xenomai_4.19.bb +++ b/recipes-kernel/linux/linux-xenomai_4.19.bb @@ -12,10 +12,14 @@ require recipes-kernel/linux/linux-xenomai.inc SRC_URI_append_amd64 = " git://gitlab.denx.de/Xenomai/ipipe-x86.git;protocol=https;branch=ipipe-x86-4.19.y" -SRCREV_amd64 = "d8ca6738bdff660d033ce755db55e7fe5210379a" -PV_amd64 = "4.19.60+" +SRCREV_amd64 = "f83bda3e0785ae2e0ea8ad530bc903d2b420c2c7" +PV_amd64 = "4.19.66+" -SRC_URI_append_armhf = " git://gitlab.denx.de/Xenomai/ipipe-arm.git;protocol=https;nobranch=1;tag=ipipe-core-4.19.33-arm-2" -PV_armhf = "4.19.33+" +SRC_URI_append_arm64 = " git://gitlab.denx.de/Xenomai/ipipe-arm64.git;protocol=https;nobranch=1;tag=ipipe-core-4.19.55-arm64-2" +PV_arm64 = "4.19.55+" + + +SRC_URI_append_armhf = " git://gitlab.denx.de/Xenomai/ipipe-arm.git;protocol=https;nobranch=1;tag=ipipe-core-4.19.55-arm-3" +PV_armhf = "4.19.55+" S = "${WORKDIR}/git" -- 2.20.1 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* Re: [xenomai-images][PATCH v2 7/9] kernel: Update 2019-09-10 14:44 ` [xenomai-images][PATCH v2 7/9] kernel: Update Q. Gylstorff @ 2019-09-10 16:52 ` Jan Kiszka 2019-09-11 9:28 ` Quirin Gylstorff 0 siblings, 1 reply; 33+ messages in thread From: Jan Kiszka @ 2019-09-10 16:52 UTC (permalink / raw) To: Q. Gylstorff, xenomai On 10.09.19 16:44, Q. Gylstorff wrote: > From: Quirin Gylstorff <quirin.gylstorff@siemens.com> > > Update amd64 to new released kernel versions. > Remove arm64 pinning to 4.14. > > Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> > --- > conf/machine/hikey.conf | 4 +--- > conf/machine/qemu-arm64.conf | 1 - > recipes-kernel/linux/files/amd64_defconfig | 2 +- > recipes-kernel/linux/linux-xenomai_4.19.bb | 12 ++++++++---- > 4 files changed, 10 insertions(+), 9 deletions(-) > > diff --git a/conf/machine/hikey.conf b/conf/machine/hikey.conf > index 3c93507..11cf635 100644 > --- a/conf/machine/hikey.conf > +++ b/conf/machine/hikey.conf > @@ -14,8 +14,6 @@ DISTRO_ARCH = "arm64" > IMAGE_TYPE ?= "wic-img" > IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" > > -PREFERRED_VERSION_linux-xenomai = "4.14.%" > - > IMAGE_PREINSTALL_append = " firmware-ti-connectivity" > > -PREFERRED_VERSION_xenomai = "next" > \ No newline at end of file > +PREFERRED_VERSION_xenomai = "next" > diff --git a/conf/machine/qemu-arm64.conf b/conf/machine/qemu-arm64.conf > index 9e1d984..472f619 100644 > --- a/conf/machine/qemu-arm64.conf > +++ b/conf/machine/qemu-arm64.conf > @@ -13,4 +13,3 @@ require qemu-machine.inc > > DISTRO_ARCH = "arm64" > PREFERRED_VERSION_xenomai = "next" > -PREFERRED_VERSION_linux-xenomai = "4.14.%" > diff --git a/recipes-kernel/linux/files/amd64_defconfig b/recipes-kernel/linux/files/amd64_defconfig > index cba31a5..9faed52 100644 > --- a/recipes-kernel/linux/files/amd64_defconfig > +++ b/recipes-kernel/linux/files/amd64_defconfig > @@ -3953,7 +3953,7 @@ CONFIG_TRACING_EVENTS_GPIO=y > # CONFIG_TEST_KMOD is not set > # CONFIG_TEST_DEBUG_VIRTUAL is not set > # CONFIG_MEMTEST is not set > -# CONFIG_BUG_ON_DATA_CORRUPTION is not set > +CONFIG_BUG_ON_DATA_CORRUPTION=y > # CONFIG_SAMPLES is not set > CONFIG_HAVE_ARCH_KGDB=y > CONFIG_KGDB=y > diff --git a/recipes-kernel/linux/linux-xenomai_4.19.bb b/recipes-kernel/linux/linux-xenomai_4.19.bb > index 9af5659..5137319 100644 > --- a/recipes-kernel/linux/linux-xenomai_4.19.bb > +++ b/recipes-kernel/linux/linux-xenomai_4.19.bb > @@ -12,10 +12,14 @@ > require recipes-kernel/linux/linux-xenomai.inc > > SRC_URI_append_amd64 = " git://gitlab.denx.de/Xenomai/ipipe-x86.git;protocol=https;branch=ipipe-x86-4.19.y" > -SRCREV_amd64 = "d8ca6738bdff660d033ce755db55e7fe5210379a" > -PV_amd64 = "4.19.60+" > +SRCREV_amd64 = "f83bda3e0785ae2e0ea8ad530bc903d2b420c2c7" > +PV_amd64 = "4.19.66+" > > -SRC_URI_append_armhf = " git://gitlab.denx.de/Xenomai/ipipe-arm.git;protocol=https;nobranch=1;tag=ipipe-core-4.19.33-arm-2" > -PV_armhf = "4.19.33+" > +SRC_URI_append_arm64 = " git://gitlab.denx.de/Xenomai/ipipe-arm64.git;protocol=https;nobranch=1;tag=ipipe-core-4.19.55-arm64-2" > +PV_arm64 = "4.19.55+" > + > + > +SRC_URI_append_armhf = " git://gitlab.denx.de/Xenomai/ipipe-arm.git;protocol=https;nobranch=1;tag=ipipe-core-4.19.55-arm-3" > +PV_armhf = "4.19.55+" > > S = "${WORKDIR}/git" > We probably also want to have the latest kernel when choosing the latest Xenomai. There are different branches, depending on the architecture, where to pick them up. On x86, I'm maintaining the "*.y[-cip]" branches for the stable versions. arm and arm64 have ipipe/master but no merging stable branches. Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux ^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [xenomai-images][PATCH v2 7/9] kernel: Update 2019-09-10 16:52 ` Jan Kiszka @ 2019-09-11 9:28 ` Quirin Gylstorff 0 siblings, 0 replies; 33+ messages in thread From: Quirin Gylstorff @ 2019-09-11 9:28 UTC (permalink / raw) To: Jan Kiszka, xenomai On 9/10/19 6:52 PM, Jan Kiszka wrote: > On 10.09.19 16:44, Q. Gylstorff wrote: >> From: Quirin Gylstorff <quirin.gylstorff@siemens.com> >> >> Update amd64 to new released kernel versions. >> Remove arm64 pinning to 4.14. >> >> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> >> --- >> conf/machine/hikey.conf | 4 +--- >> conf/machine/qemu-arm64.conf | 1 - >> recipes-kernel/linux/files/amd64_defconfig | 2 +- >> recipes-kernel/linux/linux-xenomai_4.19.bb | 12 ++++++++---- >> 4 files changed, 10 insertions(+), 9 deletions(-) >> >> diff --git a/conf/machine/hikey.conf b/conf/machine/hikey.conf >> index 3c93507..11cf635 100644 >> --- a/conf/machine/hikey.conf >> +++ b/conf/machine/hikey.conf >> @@ -14,8 +14,6 @@ DISTRO_ARCH = "arm64" >> IMAGE_TYPE ?= "wic-img" >> IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" >> -PREFERRED_VERSION_linux-xenomai = "4.14.%" >> - >> IMAGE_PREINSTALL_append = " firmware-ti-connectivity" >> -PREFERRED_VERSION_xenomai = "next" >> \ No newline at end of file >> +PREFERRED_VERSION_xenomai = "next" >> diff --git a/conf/machine/qemu-arm64.conf b/conf/machine/qemu-arm64.conf >> index 9e1d984..472f619 100644 >> --- a/conf/machine/qemu-arm64.conf >> +++ b/conf/machine/qemu-arm64.conf >> @@ -13,4 +13,3 @@ require qemu-machine.inc >> DISTRO_ARCH = "arm64" >> PREFERRED_VERSION_xenomai = "next" >> -PREFERRED_VERSION_linux-xenomai = "4.14.%" >> diff --git a/recipes-kernel/linux/files/amd64_defconfig >> b/recipes-kernel/linux/files/amd64_defconfig >> index cba31a5..9faed52 100644 >> --- a/recipes-kernel/linux/files/amd64_defconfig >> +++ b/recipes-kernel/linux/files/amd64_defconfig >> @@ -3953,7 +3953,7 @@ CONFIG_TRACING_EVENTS_GPIO=y >> # CONFIG_TEST_KMOD is not set >> # CONFIG_TEST_DEBUG_VIRTUAL is not set >> # CONFIG_MEMTEST is not set >> -# CONFIG_BUG_ON_DATA_CORRUPTION is not set >> +CONFIG_BUG_ON_DATA_CORRUPTION=y >> # CONFIG_SAMPLES is not set >> CONFIG_HAVE_ARCH_KGDB=y >> CONFIG_KGDB=y >> diff --git a/recipes-kernel/linux/linux-xenomai_4.19.bb >> b/recipes-kernel/linux/linux-xenomai_4.19.bb >> index 9af5659..5137319 100644 >> --- a/recipes-kernel/linux/linux-xenomai_4.19.bb >> +++ b/recipes-kernel/linux/linux-xenomai_4.19.bb >> @@ -12,10 +12,14 @@ >> require recipes-kernel/linux/linux-xenomai.inc >> SRC_URI_append_amd64 = " >> git://gitlab.denx.de/Xenomai/ipipe-x86.git;protocol=https;branch=ipipe-x86-4.19.y" >> >> -SRCREV_amd64 = "d8ca6738bdff660d033ce755db55e7fe5210379a" >> -PV_amd64 = "4.19.60+" >> +SRCREV_amd64 = "f83bda3e0785ae2e0ea8ad530bc903d2b420c2c7" >> +PV_amd64 = "4.19.66+" >> -SRC_URI_append_armhf = " >> git://gitlab.denx.de/Xenomai/ipipe-arm.git;protocol=https;nobranch=1;tag=ipipe-core-4.19.33-arm-2" >> >> -PV_armhf = "4.19.33+" >> +SRC_URI_append_arm64 = " >> git://gitlab.denx.de/Xenomai/ipipe-arm64.git;protocol=https;nobranch=1;tag=ipipe-core-4.19.55-arm64-2" >> >> +PV_arm64 = "4.19.55+" >> + >> + >> +SRC_URI_append_armhf = " >> git://gitlab.denx.de/Xenomai/ipipe-arm.git;protocol=https;nobranch=1;tag=ipipe-core-4.19.55-arm-3" >> >> +PV_armhf = "4.19.55+" >> S = "${WORKDIR}/git" >> > > We probably also want to have the latest kernel when choosing the latest > Xenomai. There are different branches, depending on the architecture, > where to pick them up. On x86, I'm maintaining the "*.y[-cip]" branches > for the stable versions. arm and arm64 have ipipe/master but no merging > stable branches. I will look into it. I would add a option were you set kernel to the latest commit. > > Jan > Quirin ^ permalink raw reply [flat|nested] 33+ messages in thread
* [xenomai-images][PATCH v2 8/9] tests/README: Add deployment and Setup 2019-09-10 10:27 ` Jan Kiszka ` (8 preceding siblings ...) 2019-09-10 14:44 ` [xenomai-images][PATCH v2 7/9] kernel: Update Q. Gylstorff @ 2019-09-10 14:44 ` Q. Gylstorff 2019-09-10 14:44 ` [xenomai-images][PATCH v2 9/9] tests/README: Add Architecture Q. Gylstorff 10 siblings, 0 replies; 33+ messages in thread From: Q. Gylstorff @ 2019-09-10 14:44 UTC (permalink / raw) To: xenomai From: Quirin Gylstorff <quirin.gylstorff@siemens.com> Add links to setup lava and instructions howto deploy a test. Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> --- tests/README.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tests/README.md b/tests/README.md index f107607..ffe7ba2 100644 --- a/tests/README.md +++ b/tests/README.md @@ -13,7 +13,14 @@ following images are test: - x86-64-efi - beagle-bone-black -## Tests +## Deploy test + +After the [LAVA setup](#lava-setup) a test can be deploy with the lavacli tool, e.g.: +``` +lavacli jobs run tests/jobs/xenomai-qemu-amd64.yml +``` + +# Tests Currently the following tests are executed on each target: - lava-smoketest @@ -27,3 +34,9 @@ and check machine data from the target. ### xenomai-test-suite The xenomai test suite executes the xeno-test tool from xenomai/testsuite. + +# LAVA Setup + +Setup a lava environment by following the +[installation guide](https://docs.lavasoftware.org/lava/first-installation.html) +or use [lava-docker](https://github.com/kernelci/lava-docker). -- 2.20.1 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* [xenomai-images][PATCH v2 9/9] tests/README: Add Architecture 2019-09-10 10:27 ` Jan Kiszka ` (9 preceding siblings ...) 2019-09-10 14:44 ` [xenomai-images][PATCH v2 8/9] tests/README: Add deployment and Setup Q. Gylstorff @ 2019-09-10 14:44 ` Q. Gylstorff 2019-09-10 16:54 ` Jan Kiszka 10 siblings, 1 reply; 33+ messages in thread From: Q. Gylstorff @ 2019-09-10 14:44 UTC (permalink / raw) To: xenomai From: Quirin Gylstorff <quirin.gylstorff@siemens.com> Add the schematic architecture of the current tests setup. Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> --- tests/README.md | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/tests/README.md b/tests/README.md index ffe7ba2..6ee8ada 100644 --- a/tests/README.md +++ b/tests/README.md @@ -35,8 +35,53 @@ and check machine data from the target. The xenomai test suite executes the xeno-test tool from xenomai/testsuite. +# Test Architecture + +To test xenomai-images on the target hardware the following architecture +is used: +``` + +----------+ + | Target 1 | + /--| beagle | ++-----------+ +---------+ +---------+ /----- | bone | +| | | LAVA | | LAVA | --- +----------+ +| gitlab- | ------ | master |------ | Dis- | -- +| runner | | | | patcher | \ \--- +----------+ ++-----------+ +---------+ +---------+ \- \--- | Target 2 | + \ \-| x86-64 | + \ | | + \- +----------+ + \ + \ +----------+ + \- | Target n | + \| qemu | + | | + +----------+ +``` +A test is deployed in the following steps: +1. gitlab-runner: builds the artifacts +2. After the build is successful the build artifacts are deployed to the + Lava master per scp. +3. The runner sends a lava job description to the LAVA master, who triggers the +job execution on LAVA Dispatcher. + +The LAVA master selects the LAVA Dispatcher to execute the given job on a +target. Qemu targets are executed directly on the LAVA Dispatcher. For non-virtual +targets the payload (kernel,rootfs,...) is deployed via tftp to the selected +hardware. + +The dispatcher executes the following steps: +1. Instrumentation of the rootfs. This will collect the necessary lavatools +and adds them to the rootfs +2. Power up the target +3. deploy the payload(kernel,rootfs,...) with help of the bootloader +4. trigger the payload boot +5. execute the tests +6. power off the target + # LAVA Setup Setup a lava environment by following the [installation guide](https://docs.lavasoftware.org/lava/first-installation.html) or use [lava-docker](https://github.com/kernelci/lava-docker). + -- 2.20.1 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* Re: [xenomai-images][PATCH v2 9/9] tests/README: Add Architecture 2019-09-10 14:44 ` [xenomai-images][PATCH v2 9/9] tests/README: Add Architecture Q. Gylstorff @ 2019-09-10 16:54 ` Jan Kiszka 0 siblings, 0 replies; 33+ messages in thread From: Jan Kiszka @ 2019-09-10 16:54 UTC (permalink / raw) To: Q. Gylstorff, xenomai On 10.09.19 16:44, Q. Gylstorff wrote: > From: Quirin Gylstorff <quirin.gylstorff@siemens.com> > > Add the schematic architecture of the current tests setup. > > Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> > --- > tests/README.md | 45 +++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 45 insertions(+) > > diff --git a/tests/README.md b/tests/README.md > index ffe7ba2..6ee8ada 100644 > --- a/tests/README.md > +++ b/tests/README.md > @@ -35,8 +35,53 @@ and check machine data from the target. > > The xenomai test suite executes the xeno-test tool from xenomai/testsuite. > > +# Test Architecture > + > +To test xenomai-images on the target hardware the following architecture > +is used: > +``` > + +----------+ > + | Target 1 | > + /--| beagle | > ++-----------+ +---------+ +---------+ /----- | bone | > +| | | LAVA | | LAVA | --- +----------+ > +| gitlab- | ------ | master |------ | Dis- | -- > +| runner | | | | patcher | \ \--- +----------+ > ++-----------+ +---------+ +---------+ \- \--- | Target 2 | > + \ \-| x86-64 | > + \ | | > + \- +----------+ > + \ > + \ +----------+ > + \- | Target n | > + \| qemu | > + | | > + +----------+ > +``` > +A test is deployed in the following steps: > +1. gitlab-runner: builds the artifacts > +2. After the build is successful the build artifacts are deployed to the > + Lava master per scp. > +3. The runner sends a lava job description to the LAVA master, who triggers the > +job execution on LAVA Dispatcher. > + > +The LAVA master selects the LAVA Dispatcher to execute the given job on a > +target. Qemu targets are executed directly on the LAVA Dispatcher. For non-virtual > +targets the payload (kernel,rootfs,...) is deployed via tftp to the selected > +hardware. > + > +The dispatcher executes the following steps: > +1. Instrumentation of the rootfs. This will collect the necessary lavatools > +and adds them to the rootfs > +2. Power up the target > +3. deploy the payload(kernel,rootfs,...) with help of the bootloader > +4. trigger the payload boot > +5. execute the tests > +6. power off the target > + > # LAVA Setup > > Setup a lava environment by following the > [installation guide](https://docs.lavasoftware.org/lava/first-installation.html) > or use [lava-docker](https://github.com/kernelci/lava-docker). > + > Thanks, all merged into next (except for this whitespace change here that caused git to warn). Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux ^ permalink raw reply [flat|nested] 33+ messages in thread
* [xenomai-images][PATCH 5/9] kas: Use next as target 2019-09-05 15:44 [xenomai-images][PATCH 0/9] LAVA Setup Q. Gylstorff ` (3 preceding siblings ...) 2019-09-05 15:44 ` [xenomai-images][PATCH 4/9] beagle-bone-black: Add Devicetree and fake-hwclock Q. Gylstorff @ 2019-09-05 15:44 ` Q. Gylstorff 2019-09-10 10:26 ` Jan Kiszka 2019-09-05 15:44 ` [xenomai-images][PATCH 6/9] ci: Add inline xenomai testsuite Q. Gylstorff ` (4 subsequent siblings) 9 siblings, 1 reply; 33+ messages in thread From: Q. Gylstorff @ 2019-09-05 15:44 UTC (permalink / raw) To: xenomai From: Quirin Gylstorff <quirin.gylstorff@siemens.com> For CI testing of the next branch. Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> --- kas.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kas.yml b/kas.yml index 260eb36..ee7b589 100644 --- a/kas.yml +++ b/kas.yml @@ -36,4 +36,4 @@ local_conf_header: cross: | ISAR_CROSS_COMPILE = "1" xenomai-version: | - PREFERRED_VERSION_xenomai ?= "stable" + PREFERRED_VERSION_xenomai ?= "next" -- 2.20.1 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* Re: [xenomai-images][PATCH 5/9] kas: Use next as target 2019-09-05 15:44 ` [xenomai-images][PATCH 5/9] kas: Use next as target Q. Gylstorff @ 2019-09-10 10:26 ` Jan Kiszka 0 siblings, 0 replies; 33+ messages in thread From: Jan Kiszka @ 2019-09-10 10:26 UTC (permalink / raw) To: Q. Gylstorff, xenomai On 05.09.19 17:44, Q. Gylstorff wrote: > From: Quirin Gylstorff <quirin.gylstorff@siemens.com> > > For CI testing of the next branch. > > Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> > --- > kas.yml | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/kas.yml b/kas.yml > index 260eb36..ee7b589 100644 > --- a/kas.yml > +++ b/kas.yml > @@ -36,4 +36,4 @@ local_conf_header: > cross: | > ISAR_CROSS_COMPILE = "1" > xenomai-version: | > - PREFERRED_VERSION_xenomai ?= "stable" > + PREFERRED_VERSION_xenomai ?= "next" > See my comment on patch 2. Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux ^ permalink raw reply [flat|nested] 33+ messages in thread
* [xenomai-images][PATCH 6/9] ci: Add inline xenomai testsuite 2019-09-05 15:44 [xenomai-images][PATCH 0/9] LAVA Setup Q. Gylstorff ` (4 preceding siblings ...) 2019-09-05 15:44 ` [xenomai-images][PATCH 5/9] kas: Use next as target Q. Gylstorff @ 2019-09-05 15:44 ` Q. Gylstorff 2019-09-05 15:44 ` [xenomai-images][PATCH 7/9] README: correct build line Q. Gylstorff ` (3 subsequent siblings) 9 siblings, 0 replies; 33+ messages in thread From: Q. Gylstorff @ 2019-09-05 15:44 UTC (permalink / raw) To: xenomai From: Quirin Gylstorff <quirin.gylstorff@siemens.com> Add the inline test definition to execute xeno-test for the images. Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> --- tests/README.md | 5 +++++ tests/jobs/xenomai-beaglebone.yml | 11 +++++++++++ tests/jobs/xenomai-minnow.yml | 11 +++++++++++ tests/jobs/xenomai-qemu-amd64.yml | 11 +++++++++++ tests/jobs/xenomai-qemu-arm64.yml | 13 +++++++++++++ tests/jobs/xenomai-qemu-armhf.yml | 11 +++++++++++ tests/jobs/xenomai-x86-64.yml | 11 +++++++++++ 7 files changed, 73 insertions(+) diff --git a/tests/README.md b/tests/README.md index c7e2030..f107607 100644 --- a/tests/README.md +++ b/tests/README.md @@ -17,8 +17,13 @@ following images are test: Currently the following tests are executed on each target: - lava-smoketest +- xenomai-test-suite ### lava-smoketest The lava smoke tests are part of http://git.linaro.org/lava-team/lava-functional-tests.git and check machine data from the target. + +### xenomai-test-suite + +The xenomai test suite executes the xeno-test tool from xenomai/testsuite. diff --git a/tests/jobs/xenomai-beaglebone.yml b/tests/jobs/xenomai-beaglebone.yml index 231c5d0..85f2b88 100644 --- a/tests/jobs/xenomai-beaglebone.yml +++ b/tests/jobs/xenomai-beaglebone.yml @@ -63,3 +63,14 @@ actions: from: git path: lava-test-shell/smoke-tests-basic.yaml name: smoke-tests + - repository: + metadata: + format: Lava-Test Test Definition 1.0 + name: xenomai-test-suite + description: "runs the xenomai test suite" + run: + steps: + - lava-test-case xenomai-test --shell xeno-test -k -l \"dohell -m /tmp 300\" -p 1000 + from: inline + path: inline/xenomai-test-suite.yaml + name: xenomai-test-suite diff --git a/tests/jobs/xenomai-minnow.yml b/tests/jobs/xenomai-minnow.yml index d60628d..dcdcc28 100644 --- a/tests/jobs/xenomai-minnow.yml +++ b/tests/jobs/xenomai-minnow.yml @@ -60,3 +60,14 @@ actions: from: git path: lava-test-shell/smoke-tests-basic.yaml name: smoke-tests + - repository: + metadata: + format: Lava-Test Test Definition 1.0 + name: xenomai-test-suite + description: "runs the xenomai test suite" + run: + steps: + - lava-test-case xenomai-test --shell xeno-test -k -l \"dohell -m /tmp 300\" -p 1000 + from: inline + path: inline/xenomai-test-suite.yaml + name: xenomai-test-suite diff --git a/tests/jobs/xenomai-qemu-amd64.yml b/tests/jobs/xenomai-qemu-amd64.yml index 12f4c7f..2976f89 100644 --- a/tests/jobs/xenomai-qemu-amd64.yml +++ b/tests/jobs/xenomai-qemu-amd64.yml @@ -74,3 +74,14 @@ actions: from: git path: lava-test-shell/smoke-tests-basic.yaml name: smoke-tests + - repository: + metadata: + format: Lava-Test Test Definition 1.0 + name: xenomai-test-suite + description: "runs the xenomai test suite" + run: + steps: + - lava-test-case xenomai-test --shell xeno-test -k + from: inline + path: inline/xenomai-test-suite.yaml + name: xenomai-test-suite diff --git a/tests/jobs/xenomai-qemu-arm64.yml b/tests/jobs/xenomai-qemu-arm64.yml index fceee0c..8ba4575 100644 --- a/tests/jobs/xenomai-qemu-arm64.yml +++ b/tests/jobs/xenomai-qemu-arm64.yml @@ -81,3 +81,16 @@ actions: from: git path: lava-test-shell/smoke-tests-basic.yaml name: smoke-tests + - repository: + metadata: + format: Lava-Test Test Definition 1.0 + name: xenomai-test-suite + description: "runs the xenomai smokey test suite" + maintainer: + - quirin.gylstorff@siemens.org + run: + steps: + - lava-test-case xenomai-smokey --shell xeno-test -k + from: inline + path: inline/xenomai-test-suite.yaml + name: xenomai-test-suite diff --git a/tests/jobs/xenomai-qemu-armhf.yml b/tests/jobs/xenomai-qemu-armhf.yml index d6603af..238265b 100644 --- a/tests/jobs/xenomai-qemu-armhf.yml +++ b/tests/jobs/xenomai-qemu-armhf.yml @@ -74,3 +74,14 @@ actions: from: git path: lava-test-shell/smoke-tests-basic.yaml name: smoke-tests + - repository: + metadata: + format: Lava-Test Test Definition 1.0 + name: xenomai-test-suite + description: "runs the xenomai test suite" + run: + steps: + - lava-test-case xenomai-test --shell xeno-test -k + from: inline + path: inline/xenomai-test-suite.yaml + name: xenomai-test-suite diff --git a/tests/jobs/xenomai-x86-64.yml b/tests/jobs/xenomai-x86-64.yml index 0fb3ea8..9d58c45 100644 --- a/tests/jobs/xenomai-x86-64.yml +++ b/tests/jobs/xenomai-x86-64.yml @@ -61,3 +61,14 @@ actions: from: git path: lava-test-shell/smoke-tests-basic.yaml name: smoke-tests + - repository: + metadata: + format: Lava-Test Test Definition 1.0 + name: xenomai-test-suite + description: "runs the xenomai test suite" + run: + steps: + - lava-test-case xenomai-test --shell xeno-test -k -l \"dohell -m /tmp 300\" -p 1000 + from: inline + path: inline/xenomai-test-suite.yaml + name: xenomai-test-suite -- 2.20.1 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* [xenomai-images][PATCH 7/9] README: correct build line 2019-09-05 15:44 [xenomai-images][PATCH 0/9] LAVA Setup Q. Gylstorff ` (5 preceding siblings ...) 2019-09-05 15:44 ` [xenomai-images][PATCH 6/9] ci: Add inline xenomai testsuite Q. Gylstorff @ 2019-09-05 15:44 ` Q. Gylstorff 2019-09-05 15:44 ` [xenomai-images][PATCH 8/9] kernel: Update Q. Gylstorff ` (2 subsequent siblings) 9 siblings, 0 replies; 33+ messages in thread From: Q. Gylstorff @ 2019-09-05 15:44 UTC (permalink / raw) To: xenomai From: Quirin Gylstorff <quirin.gylstorff@siemens.com> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f65eac7..5b84983 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ To execute the CI build use: ``` gitlab-runner exec docker --docker-privileged \ --env "HTTP_PROXY=$HTTP_PROXY" --env "HTTPS_PROXY=$HTTPS_PROXY" \ - --env "NO_PROXY=$NO_PROXY" build:armhf + --env "NO_PROXY=$NO_PROXY" build:qemu-armhf ``` ## Community Resources -- 2.20.1 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* [xenomai-images][PATCH 8/9] kernel: Update 2019-09-05 15:44 [xenomai-images][PATCH 0/9] LAVA Setup Q. Gylstorff ` (6 preceding siblings ...) 2019-09-05 15:44 ` [xenomai-images][PATCH 7/9] README: correct build line Q. Gylstorff @ 2019-09-05 15:44 ` Q. Gylstorff 2019-09-05 15:44 ` [xenomai-images][PATCH 9/9] tests/README: Add deployment and Setup Q. Gylstorff 2019-09-06 10:29 ` [xenomai-images][PATCH 0/9] LAVA Setup Jan Kiszka 9 siblings, 0 replies; 33+ messages in thread From: Q. Gylstorff @ 2019-09-05 15:44 UTC (permalink / raw) To: xenomai From: Quirin Gylstorff <quirin.gylstorff@siemens.com> Update amd64 to new released kernel versions. Remove arm64 pinning to 4.14. Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> --- conf/machine/hikey.conf | 2 -- conf/machine/qemu-arm64.conf | 1 - recipes-kernel/linux/files/amd64_defconfig | 2 +- recipes-kernel/linux/linux-xenomai_4.19.bb | 12 ++++++++---- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/conf/machine/hikey.conf b/conf/machine/hikey.conf index 3c93507..1b96456 100644 --- a/conf/machine/hikey.conf +++ b/conf/machine/hikey.conf @@ -14,8 +14,6 @@ DISTRO_ARCH = "arm64" IMAGE_TYPE ?= "wic-img" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" -PREFERRED_VERSION_linux-xenomai = "4.14.%" - IMAGE_PREINSTALL_append = " firmware-ti-connectivity" PREFERRED_VERSION_xenomai = "next" \ No newline at end of file diff --git a/conf/machine/qemu-arm64.conf b/conf/machine/qemu-arm64.conf index 9e1d984..472f619 100644 --- a/conf/machine/qemu-arm64.conf +++ b/conf/machine/qemu-arm64.conf @@ -13,4 +13,3 @@ require qemu-machine.inc DISTRO_ARCH = "arm64" PREFERRED_VERSION_xenomai = "next" -PREFERRED_VERSION_linux-xenomai = "4.14.%" diff --git a/recipes-kernel/linux/files/amd64_defconfig b/recipes-kernel/linux/files/amd64_defconfig index cba31a5..9faed52 100644 --- a/recipes-kernel/linux/files/amd64_defconfig +++ b/recipes-kernel/linux/files/amd64_defconfig @@ -3953,7 +3953,7 @@ CONFIG_TRACING_EVENTS_GPIO=y # CONFIG_TEST_KMOD is not set # CONFIG_TEST_DEBUG_VIRTUAL is not set # CONFIG_MEMTEST is not set -# CONFIG_BUG_ON_DATA_CORRUPTION is not set +CONFIG_BUG_ON_DATA_CORRUPTION=y # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y CONFIG_KGDB=y diff --git a/recipes-kernel/linux/linux-xenomai_4.19.bb b/recipes-kernel/linux/linux-xenomai_4.19.bb index 9af5659..5137319 100644 --- a/recipes-kernel/linux/linux-xenomai_4.19.bb +++ b/recipes-kernel/linux/linux-xenomai_4.19.bb @@ -12,10 +12,14 @@ require recipes-kernel/linux/linux-xenomai.inc SRC_URI_append_amd64 = " git://gitlab.denx.de/Xenomai/ipipe-x86.git;protocol=https;branch=ipipe-x86-4.19.y" -SRCREV_amd64 = "d8ca6738bdff660d033ce755db55e7fe5210379a" -PV_amd64 = "4.19.60+" +SRCREV_amd64 = "f83bda3e0785ae2e0ea8ad530bc903d2b420c2c7" +PV_amd64 = "4.19.66+" -SRC_URI_append_armhf = " git://gitlab.denx.de/Xenomai/ipipe-arm.git;protocol=https;nobranch=1;tag=ipipe-core-4.19.33-arm-2" -PV_armhf = "4.19.33+" +SRC_URI_append_arm64 = " git://gitlab.denx.de/Xenomai/ipipe-arm64.git;protocol=https;nobranch=1;tag=ipipe-core-4.19.55-arm64-2" +PV_arm64 = "4.19.55+" + + +SRC_URI_append_armhf = " git://gitlab.denx.de/Xenomai/ipipe-arm.git;protocol=https;nobranch=1;tag=ipipe-core-4.19.55-arm-3" +PV_armhf = "4.19.55+" S = "${WORKDIR}/git" -- 2.20.1 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* [xenomai-images][PATCH 9/9] tests/README: Add deployment and Setup 2019-09-05 15:44 [xenomai-images][PATCH 0/9] LAVA Setup Q. Gylstorff ` (7 preceding siblings ...) 2019-09-05 15:44 ` [xenomai-images][PATCH 8/9] kernel: Update Q. Gylstorff @ 2019-09-05 15:44 ` Q. Gylstorff 2019-09-06 10:29 ` [xenomai-images][PATCH 0/9] LAVA Setup Jan Kiszka 9 siblings, 0 replies; 33+ messages in thread From: Q. Gylstorff @ 2019-09-05 15:44 UTC (permalink / raw) To: xenomai From: Quirin Gylstorff <quirin.gylstorff@siemens.com> Add links to setup lava and instructions howto deploy a test. Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> --- tests/README.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tests/README.md b/tests/README.md index f107607..ffe7ba2 100644 --- a/tests/README.md +++ b/tests/README.md @@ -13,7 +13,14 @@ following images are test: - x86-64-efi - beagle-bone-black -## Tests +## Deploy test + +After the [LAVA setup](#lava-setup) a test can be deploy with the lavacli tool, e.g.: +``` +lavacli jobs run tests/jobs/xenomai-qemu-amd64.yml +``` + +# Tests Currently the following tests are executed on each target: - lava-smoketest @@ -27,3 +34,9 @@ and check machine data from the target. ### xenomai-test-suite The xenomai test suite executes the xeno-test tool from xenomai/testsuite. + +# LAVA Setup + +Setup a lava environment by following the +[installation guide](https://docs.lavasoftware.org/lava/first-installation.html) +or use [lava-docker](https://github.com/kernelci/lava-docker). -- 2.20.1 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* Re: [xenomai-images][PATCH 0/9] LAVA Setup 2019-09-05 15:44 [xenomai-images][PATCH 0/9] LAVA Setup Q. Gylstorff ` (8 preceding siblings ...) 2019-09-05 15:44 ` [xenomai-images][PATCH 9/9] tests/README: Add deployment and Setup Q. Gylstorff @ 2019-09-06 10:29 ` Jan Kiszka 2019-09-06 13:49 ` [xenomai-images][PATCH 10/9] tests/README: Add Architecture Q. Gylstorff 2019-09-06 14:08 ` [xenomai-images][PATCH 0/9] LAVA Setup Quirin Gylstorff 9 siblings, 2 replies; 33+ messages in thread From: Jan Kiszka @ 2019-09-06 10:29 UTC (permalink / raw) To: Q. Gylstorff, xenomai On 05.09.19 17:44, Q. Gylstorff wrote: > From: Quirin Gylstorff <quirin.gylstorff@siemens.com> > > This patchset adapts xenomai-images for the execution of tests > on Linaro Automated Validation Architecture. > Could you provide a rough overview oaf the architecture behind this? Where we are already, what more will be coming? Specifically as the community does not know what we discussed already. Thanks, Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux ^ permalink raw reply [flat|nested] 33+ messages in thread
* [xenomai-images][PATCH 10/9] tests/README: Add Architecture 2019-09-06 10:29 ` [xenomai-images][PATCH 0/9] LAVA Setup Jan Kiszka @ 2019-09-06 13:49 ` Q. Gylstorff 2019-09-06 14:08 ` [xenomai-images][PATCH 0/9] LAVA Setup Quirin Gylstorff 1 sibling, 0 replies; 33+ messages in thread From: Q. Gylstorff @ 2019-09-06 13:49 UTC (permalink / raw) To: xenomai From: Quirin Gylstorff <quirin.gylstorff@siemens.com> Add the schematic architecture of the current tests setup. Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> --- tests/README.md | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/tests/README.md b/tests/README.md index ffe7ba2..6ee8ada 100644 --- a/tests/README.md +++ b/tests/README.md @@ -35,8 +35,53 @@ and check machine data from the target. The xenomai test suite executes the xeno-test tool from xenomai/testsuite. +# Test Architecture + +To test xenomai-images on the target hardware the following architecture +is used: +``` + +----------+ + | Target 1 | + /--| beagle | ++-----------+ +---------+ +---------+ /----- | bone | +| | | LAVA | | LAVA | --- +----------+ +| gitlab- | ------ | master |------ | Dis- | -- +| runner | | | | patcher | \ \--- +----------+ ++-----------+ +---------+ +---------+ \- \--- | Target 2 | + \ \-| x86-64 | + \ | | + \- +----------+ + \ + \ +----------+ + \- | Target n | + \| qemu | + | | + +----------+ +``` +A test is deployed in the following steps: +1. gitlab-runner: builds the artifacts +2. After the build is successful the build artifacts are deployed to the + Lava master per scp. +3. The runner sends a lava job description to the LAVA master, who triggers the +job execution on LAVA Dispatcher. + +The LAVA master selects the LAVA Dispatcher to execute the given job on a +target. Qemu targets are executed directly on the LAVA Dispatcher. For non-virtual +targets the payload (kernel,rootfs,...) is deployed via tftp to the selected +hardware. + +The dispatcher executes the following steps: +1. Instrumentation of the rootfs. This will collect the necessary lavatools +and adds them to the rootfs +2. Power up the target +3. deploy the payload(kernel,rootfs,...) with help of the bootloader +4. trigger the payload boot +5. execute the tests +6. power off the target + # LAVA Setup Setup a lava environment by following the [installation guide](https://docs.lavasoftware.org/lava/first-installation.html) or use [lava-docker](https://github.com/kernelci/lava-docker). + -- 2.20.1 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* Re: [xenomai-images][PATCH 0/9] LAVA Setup 2019-09-06 10:29 ` [xenomai-images][PATCH 0/9] LAVA Setup Jan Kiszka 2019-09-06 13:49 ` [xenomai-images][PATCH 10/9] tests/README: Add Architecture Q. Gylstorff @ 2019-09-06 14:08 ` Quirin Gylstorff 1 sibling, 0 replies; 33+ messages in thread From: Quirin Gylstorff @ 2019-09-06 14:08 UTC (permalink / raw) To: Jan Kiszka, xenomai On 9/6/19 12:29 PM, Jan Kiszka wrote: > On 05.09.19 17:44, Q. Gylstorff wrote: >> From: Quirin Gylstorff <quirin.gylstorff@siemens.com> >> >> This patchset adapts xenomai-images for the execution of tests >> on Linaro Automated Validation Architecture. >> > > Could you provide a rough overview oaf the architecture behind this? > Where we are already, what more will be coming? Specifically as the > community does not know what we discussed already. I posted the rough architecture as PATCH 10/9. Next steps are: - adding a arm64 hardware target - documentation how to setup a own lab with lava-docker - discussion for a public LAVA master - split the test and deployment from the build step in .gitlab-ci - Add a own repository for the test description instead using inline-testcase Quirin > > Thanks, > Jan > ^ permalink raw reply [flat|nested] 33+ messages in thread
end of thread, other threads:[~2019-09-11 9:28 UTC | newest] Thread overview: 33+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-09-05 15:44 [xenomai-images][PATCH 0/9] LAVA Setup Q. Gylstorff 2019-09-05 15:44 ` [xenomai-images][PATCH 1/9] ci: Add LAVA jobs for targets Q. Gylstorff 2019-09-10 9:56 ` Jan Kiszka 2019-09-10 10:17 ` Quirin Gylstorff 2019-09-05 15:44 ` [xenomai-images][PATCH 2/9] machine: Allow override of the image type Q. Gylstorff 2019-09-10 10:25 ` Jan Kiszka 2019-09-10 11:16 ` Quirin Gylstorff 2019-09-05 15:44 ` [xenomai-images][PATCH 3/9] linux-xenomai: NFS support in KERNEL configuration Q. Gylstorff 2019-09-05 15:44 ` [xenomai-images][PATCH 4/9] beagle-bone-black: Add Devicetree and fake-hwclock Q. Gylstorff 2019-09-10 10:27 ` Jan Kiszka 2019-09-10 11:18 ` Quirin Gylstorff 2019-09-10 14:44 ` [xenomai-images][PATCH v2 0/9] LAVA Setup Q. Gylstorff 2019-09-10 14:44 ` [xenomai-images][PATCH v2 1/9] ci: Add LAVA jobs for targets Q. Gylstorff 2019-09-10 14:44 ` [xenomai-images][PATCH v2 2/9] ci: Add needs key word Q. Gylstorff 2019-09-10 14:44 ` [xenomai-images][PATCH v2 3/9] machine: Allow override of the image type Q. Gylstorff 2019-09-10 14:44 ` [xenomai-images][PATCH v2 4/9] kas: Use next as target Q. Gylstorff 2019-09-10 14:44 ` [xenomai-images][PATCH v2 5/9] ci: Add inline xenomai testsuite Q. Gylstorff 2019-09-10 14:44 ` [xenomai-images][PATCH v2 6/9] README: correct build line Q. Gylstorff 2019-09-10 14:44 ` [xenomai-images][PATCH v2 7/9] kernel: Update Q. Gylstorff 2019-09-10 16:52 ` Jan Kiszka 2019-09-11 9:28 ` Quirin Gylstorff 2019-09-10 14:44 ` [xenomai-images][PATCH v2 8/9] tests/README: Add deployment and Setup Q. Gylstorff 2019-09-10 14:44 ` [xenomai-images][PATCH v2 9/9] tests/README: Add Architecture Q. Gylstorff 2019-09-10 16:54 ` Jan Kiszka 2019-09-05 15:44 ` [xenomai-images][PATCH 5/9] kas: Use next as target Q. Gylstorff 2019-09-10 10:26 ` Jan Kiszka 2019-09-05 15:44 ` [xenomai-images][PATCH 6/9] ci: Add inline xenomai testsuite Q. Gylstorff 2019-09-05 15:44 ` [xenomai-images][PATCH 7/9] README: correct build line Q. Gylstorff 2019-09-05 15:44 ` [xenomai-images][PATCH 8/9] kernel: Update Q. Gylstorff 2019-09-05 15:44 ` [xenomai-images][PATCH 9/9] tests/README: Add deployment and Setup Q. Gylstorff 2019-09-06 10:29 ` [xenomai-images][PATCH 0/9] LAVA Setup Jan Kiszka 2019-09-06 13:49 ` [xenomai-images][PATCH 10/9] tests/README: Add Architecture Q. Gylstorff 2019-09-06 14:08 ` [xenomai-images][PATCH 0/9] LAVA Setup Quirin Gylstorff
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.