Skip to contentSkip to conversation

tests: restrict realtime cpu for x86 and qemu type of devices

PATCH In review Hongzhan Chen 2 participants 2 messages Jun 28, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests: restrict realtime cpu for x86 and qemu type of devices

1. If there is no CPU restriction on the bootargs, smokey cpu_affinity test would be skipped reporting with "no kernel support" for those without non-RT cpu.

2. delete unused test job.

tests/jobs/xenomai-ipc227e.yml +2 -0
index a5a181c..209c5d4 100644
@@ -72,3 +72,5 @@ actions:
       from: inline
       path: inline/xenomai-test-suite.yaml
       name: xenomai-test-suite
+context:
+  extra_kernel_args: xenomai.supported_cpus=7
tests/jobs/xenomai-minnow.yml deleted +0 -73

73 lines not on this page · raw message

tests/jobs/xenomai-qemu-amd64.yml +1 -1
index c335292..e42f6ec 100644
@@ -46,7 +46,7 @@ actions:
     to: tmpfs
     images:
       kernel:
-        image_arg: -kernel {kernel} -append "root=/dev/sdb console=ttyS0,115200 console=tty0"
+        image_arg: -kernel {kernel} -append "root=/dev/sdb console=ttyS0,115200 console=tty0 xenomai.supported_cpus=1"
         url: ${DEPLOY_URL}/${ISAR_IMAGE}-${ISAR_DISTRIBUTION}-${TARGET}-vmlinuz
       initrd:
         image_arg: -initrd {initrd}
tests/jobs/xenomai-qemu-arm64.yml +1 -1
index 88fb880..cc60564 100644
@@ -50,7 +50,7 @@ actions:
     to: tmpfs
     images:
       kernel:
-        image_arg: -kernel {kernel} -append "root=/dev/vda"
+        image_arg: -kernel {kernel} -append "root=/dev/vda xenomai.supported_cpus=1"
         url: ${DEPLOY_URL}/${ISAR_IMAGE}-${ISAR_DISTRIBUTION}-${TARGET}-vmlinuz
       initrd:
         image_arg: -initrd {initrd}
tests/jobs/xenomai-qemu-armhf.yml +1 -1
index 3e3a8ab..2afe250 100644
@@ -46,7 +46,7 @@ actions:
     to: tmpfs
     images:
       kernel:
-        image_arg: -kernel {kernel} -append "root=/dev/vdb"
+        image_arg: -kernel {kernel} -append "root=/dev/vdb xenomai.supported_cpus=1"
         url: ${DEPLOY_URL}/${ISAR_IMAGE}-${ISAR_DISTRIBUTION}-${TARGET}-vmlinuz
       initrd:
         image_arg: -initrd {initrd}
tests/jobs/xenomai-x86-64-efi.yml +2 -0
index bc71b75..d1418c1 100644
@@ -72,3 +72,5 @@ actions:
       from: inline
       path: inline/xenomai-test-suite.yaml
       name: xenomai-test-suite
+context:
+  extra_kernel_args: xenomai.supported_cpus=7
Signature · 1 line
2.17.1
#1 lore raw
Quoted 6 lines · Hongzhan Chen

1. If there is no CPU restriction on the bootargs, smokey cpu_affinity test would be skipped reporting with "no kernel support" for those without non-RT cpu.

2. delete unused test job.

2 items, 2 patches, please.

tests/jobs/xenomai-ipc227e.yml actions: · line 76

Quoted 12 lines
tests/jobs/xenomai-ipc227e.yml +2 -0
index a5a181c..209c5d4 100644
@@ -72,3 +72,5 @@ actions:
       from: inline
       path: inline/xenomai-test-suite.yaml
       name: xenomai-test-suite
+context:
+  extra_kernel_args: xenomai.supported_cpus=7

Maybe format this as hex (0x7) to remind people that this is a mask.

Quoted 124 lines
tests/jobs/xenomai-minnow.yml deleted +0 -73
deleted file mode 100644
index d5292ff..0000000
@@ -1,73 +0,0 @@
-#
-# Xenomai Real-Time System
-#
-# Copyright (c) Siemens AG, 2019
-#
-# Authors:
-#  Quirin Gylstorff <[email protected]>
-#
-# SPDX-License-Identifier: MIT
-#
-job_name: xenomai-test-suite
-device_type: minnowboard-max-E3825
-timeouts:
-  job:
-    minutes: 90
-  action:
-    minutes: 65
-  connection:
-    minutes: 5
-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: 15
-    to: tftp
-    kernel:
-      url: ${DEPLOY_URL}/${ISAR_IMAGE}-${ISAR_DISTRIBUTION}-${TARGET}-vmlinuz
-      type: bzimage
-    ramdisk:
-      url: ${DEPLOY_URL}/${ISAR_IMAGE}-${ISAR_DISTRIBUTION}-${TARGET}-initrd.img
-      compression: gz
-    nfsrootfs:
-      url: ${DEPLOY_URL}/${ISAR_IMAGE}-${ISAR_DISTRIBUTION}-${TARGET}.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
-    - 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
tests/jobs/xenomai-qemu-amd64.yml +1 -1
index c335292..e42f6ec 100644
@@ -46,7 +46,7 @@ actions:
     to: tmpfs
     images:
       kernel:
-        image_arg: -kernel {kernel} -append "root=/dev/sdb console=ttyS0,115200 console=tty0"
+        image_arg: -kernel {kernel} -append "root=/dev/sdb console=ttyS0,115200 console=tty0 xenomai.supported_cpus=1"
         url: ${DEPLOY_URL}/${ISAR_IMAGE}-${ISAR_DISTRIBUTION}-${TARGET}-vmlinuz
       initrd:
         image_arg: -initrd {initrd}
tests/jobs/xenomai-qemu-arm64.yml +1 -1
index 88fb880..cc60564 100644
@@ -50,7 +50,7 @@ actions:
     to: tmpfs
     images:
       kernel:
-        image_arg: -kernel {kernel} -append "root=/dev/vda"
+        image_arg: -kernel {kernel} -append "root=/dev/vda xenomai.supported_cpus=1"
         url: ${DEPLOY_URL}/${ISAR_IMAGE}-${ISAR_DISTRIBUTION}-${TARGET}-vmlinuz
       initrd:
         image_arg: -initrd {initrd}
tests/jobs/xenomai-qemu-armhf.yml +1 -1
index 3e3a8ab..2afe250 100644
@@ -46,7 +46,7 @@ actions:
     to: tmpfs
     images:
       kernel:
-        image_arg: -kernel {kernel} -append "root=/dev/vdb"
+        image_arg: -kernel {kernel} -append "root=/dev/vdb xenomai.supported_cpus=1"
         url: ${DEPLOY_URL}/${ISAR_IMAGE}-${ISAR_DISTRIBUTION}-${TARGET}-vmlinuz
       initrd:
         image_arg: -initrd {initrd}
tests/jobs/xenomai-x86-64-efi.yml +0 -0
index bc71b75..d1418c1 100644

tests/jobs/xenomai-x86-64-efi.yml actions: · line 76

Quoted 5 lines
tests/jobs/xenomai-x86-64-efi.yml +2 -0
@@ -72,3 +72,5 @@ actions:
       from: inline
       path: inline/xenomai-test-suite.yaml
       name: xenomai-test-suite
+context:
+  extra_kernel_args: xenomai.supported_cpus=7

Jan

Signature · 2 lines
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux