Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

drop the 'DEVICE_TYPE' variable #185

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

drop the 'DEVICE_TYPE' variable #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion devices/qemu_arm64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down
1 change: 0 additions & 1 deletion projects/armnn/variables.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion projects/lkft/devices/qemu_arm64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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") %}
Expand Down
2 changes: 1 addition & 1 deletion projects/lkft/fastboot.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion projects/lkft/qemu.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:") %}
Expand Down
1 change: 0 additions & 1 deletion projects/lkft/variables.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion projects/lkft/variables.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion testcases/master/template-kselftest.yaml.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
2 changes: 1 addition & 1 deletion testcases/master/template-kvm-unit-tests.yaml.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
2 changes: 1 addition & 1 deletion testcases/master/template-ltp.yaml.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}'
Expand Down
1 change: 0 additions & 1 deletion variables.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion variables.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down