From 1037bca8fd52580ca0ed169d097d61530dad5332 Mon Sep 17 00:00:00 2001 From: Anders Roxell Date: Mon, 11 Apr 2022 15:45:15 +0200 Subject: [PATCH] drop the 'DEVICE_TYPE' variable Drop the 'DEVICE_TYPE' variable in favor the 'device_type' variable. Reported-by: Yongqin Liu Signed-off-by: Anders Roxell --- devices/qemu_arm64 | 2 +- projects/armnn/variables.yaml | 1 - projects/lkft/devices/qemu_arm64 | 2 +- projects/lkft/fastboot.jinja2 | 2 +- projects/lkft/qemu.jinja2 | 2 +- projects/lkft/variables.ini | 1 - projects/lkft/variables.yaml | 1 - testcases/master/template-kselftest.yaml.jinja2 | 2 +- testcases/master/template-kvm-unit-tests.yaml.jinja2 | 2 +- testcases/master/template-ltp.yaml.jinja2 | 2 +- variables.ini | 1 - variables.yaml | 1 - 12 files changed, 7 insertions(+), 12 deletions(-) diff --git a/devices/qemu_arm64 b/devices/qemu_arm64 index 2712af61..2f92b2f6 100644 --- a/devices/qemu_arm64 +++ b/devices/qemu_arm64 @@ -14,7 +14,7 @@ arch: arm64 netdevice: tap machine: {{ GS_MACHINE }} - cpu: {{ QEMU_CPU_VARIABLES }}{% if DEVICE_TYPE == 'qemu_arm' %},aarch64=off{% endif %} + cpu: {{ QEMU_CPU_VARIABLES }}{% if device_type == 'qemu_arm' %},aarch64=off{% endif %} guestfs_size: {{ guestfs_size|default(512) }} {% endblock global_settings %} diff --git a/projects/armnn/variables.yaml b/projects/armnn/variables.yaml index c69ab1c4..8dae48d9 100644 --- a/projects/armnn/variables.yaml +++ b/projects/armnn/variables.yaml @@ -3,7 +3,6 @@ "KERNEL_ARCH_ARTIFACTS_PUB_DEST": "artifact-url" "BOOT_URL": "boot-url" "SYSTEM_URL": "system-url" -"DEVICE_TYPE": "device-type" "BUILD_NUMBER": "123" "LAVA_JOB_PRIORITY": "99" "ROOTFS_URL": "variable-value" diff --git a/projects/lkft/devices/qemu_arm64 b/projects/lkft/devices/qemu_arm64 index 4a817067..22333ebc 100644 --- a/projects/lkft/devices/qemu_arm64 +++ b/projects/lkft/devices/qemu_arm64 @@ -7,7 +7,7 @@ {% set OVERLAY_MODULES_URL_COMP = OVERLAY_MODULES_URL_COMP|default("xz") %} {% set OVERLAY_PERF_URL_FORMAT = OVERLAY_PERF_URL_FORMAT|default("tar") %} {% set OVERLAY_PERF_URL_COMP = OVERLAY_PERF_URL_COMP|default("xz") %} -{% if DEVICE_TYPE == 'qemu_arm' %} +{% if device_type == 'qemu_arm' %} {% set GS_MACHINE = "virt-2.10,accel=kvm" %} {% else %} {% set QEMU_CPU_VARIABLES = QEMU_CPU_VARIABLES|default("max,pauth-impdef=on") %} diff --git a/projects/lkft/fastboot.jinja2 b/projects/lkft/fastboot.jinja2 index c3211a93..c56ecdee 100644 --- a/projects/lkft/fastboot.jinja2 +++ b/projects/lkft/fastboot.jinja2 @@ -15,7 +15,7 @@ {{ super() }} {% if DEPLOY_TARGET == "downloads" %} steps: - - /kir/lava/board_setup.sh {{DEVICE_TYPE}} + - /kir/lava/board_setup.sh {{device_type}} - deploy: timeout: diff --git a/projects/lkft/qemu.jinja2 b/projects/lkft/qemu.jinja2 index 3db8d37c..a1363a32 100644 --- a/projects/lkft/qemu.jinja2 +++ b/projects/lkft/qemu.jinja2 @@ -4,7 +4,7 @@ {% include PROJECT+"include/lkft-metadata.jinja2" %} {% endblock metadata %} -{% if DEVICE_TYPE == 'qemu_arm' %} +{% if device_type == 'qemu_arm' %} {# libhugetlbfs_word_size variable is required for libhugetlbfs.yaml test template #} {% set libhuggetlbfs_word_size = 32 %} {% set AUTO_LOGIN_PROMPT = AUTO_LOGIN_PROMPT|default("am57xx-evm login:") %} diff --git a/projects/lkft/variables.ini b/projects/lkft/variables.ini index 9e40d389..8da1930c 100644 --- a/projects/lkft/variables.ini +++ b/projects/lkft/variables.ini @@ -10,7 +10,6 @@ BUILD_URL=build-url KERNEL_ARCH_ARTIFACTS_PUB_DEST=artifact-url BOOT_URL=boot-url SYSTEM_URL=system-url -DEVICE_TYPE=device-type SKIPGEN_KERNEL_VERSION=skipgen-kernel-version BUILD_NUMBER=123 LAVA_JOB_PRIORITY=99 diff --git a/projects/lkft/variables.yaml b/projects/lkft/variables.yaml index 0c136ea3..3afee305 100644 --- a/projects/lkft/variables.yaml +++ b/projects/lkft/variables.yaml @@ -10,7 +10,6 @@ "KERNEL_ARCH_ARTIFACTS_PUB_DEST": "artifact-url" "BOOT_URL": "boot-url" "SYSTEM_URL": "system-url" -"DEVICE_TYPE": "device-type" "SKIPGEN_KERNEL_VERSION": "skipgen-kernel-version" "BUILD_NUMBER": "123" "LAVA_JOB_PRIORITY": "99" diff --git a/testcases/master/template-kselftest.yaml.jinja2 b/testcases/master/template-kselftest.yaml.jinja2 index 979297f8..91dd6791 100644 --- a/testcases/master/template-kselftest.yaml.jinja2 +++ b/testcases/master/template-kselftest.yaml.jinja2 @@ -44,7 +44,7 @@ TST_CMDFILES: '{{testname}}' KSELFTEST_PATH: {{KSELFTEST_PATH}} SKIPFILE: skipfile-lkft.yaml - BOARD: '{{ DEVICE_TYPE }}' + BOARD: '{{ device_type }}' BRANCH: '{{ SKIPGEN_KERNEL_VERSION|default('default') }}' ENVIRONMENT: '{{ ENVIRONMENT|default("production") }}' {% endfor %} diff --git a/testcases/master/template-kvm-unit-tests.yaml.jinja2 b/testcases/master/template-kvm-unit-tests.yaml.jinja2 index 4dc9d2c6..03879ca3 100644 --- a/testcases/master/template-kvm-unit-tests.yaml.jinja2 +++ b/testcases/master/template-kvm-unit-tests.yaml.jinja2 @@ -17,6 +17,6 @@ {{ super() }} parameters: SKIP_INSTALL: 'true' - SMP: {% if DEVICE_TYPE == "juno-r2" %}'false'{% else %}'true'{% endif %} + SMP: {% if device_type == "juno-r2" %}'false'{% else %}'true'{% endif %} GIT_REF: "{{KVM_UNIT_TESTS_REVISION | default('a3d5d6b9333e10898852b96311c3d3db0baf5a4e')}}" {% endblock test_target %} diff --git a/testcases/master/template-ltp.yaml.jinja2 b/testcases/master/template-ltp.yaml.jinja2 index 569757c5..fbf294ac 100644 --- a/testcases/master/template-ltp.yaml.jinja2 +++ b/testcases/master/template-ltp.yaml.jinja2 @@ -27,7 +27,7 @@ SKIP_INSTALL: 'true' TST_CMDFILES: '{{testname}}' SKIPFILE: skipfile-lkft.yaml - BOARD: '{{ DEVICE_TYPE }}' + BOARD: '{{ device_type }}' BRANCH: '{{ SKIPGEN_KERNEL_VERSION|default('default') }}' ENVIRONMENT: '{{ ENVIRONMENT|default('production') }}' TIMEOUT_MULTIPLIER: '{{ TIMEOUT_MULTIPLIER|default('3') }}' diff --git a/variables.ini b/variables.ini index c563b663..23f5c89b 100644 --- a/variables.ini +++ b/variables.ini @@ -10,7 +10,6 @@ BUILD_URL=build-url KERNEL_ARCH_ARTIFACTS_PUB_DEST=artifact-url BOOT_URL=boot-url SYSTEM_URL=system-url -DEVICE_TYPE=device-type SKIPGEN_KERNEL_VERSION=skipgen-kernel-version BUILD_NUMBER=123 LAVA_JOB_PRIORITY=99 diff --git a/variables.yaml b/variables.yaml index 3eb13ba0..29ed8ee3 100644 --- a/variables.yaml +++ b/variables.yaml @@ -10,7 +10,6 @@ "KERNEL_ARCH_ARTIFACTS_PUB_DEST": "artifact-url" "BOOT_URL": "boot-url" "SYSTEM_URL": "system-url" -"DEVICE_TYPE": "device-type" "SKIPGEN_KERNEL_VERSION": "skipgen-kernel-version" "BUILD_NUMBER": "123" "LAVA_JOB_PRIORITY": "99"