Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions lava_test_plans/devices/iq-8075-evk
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{% set PROJECT = PROJECT|default("") %}
{% extends PROJECT+"flasher.jinja2" %}

{% set BOOT_OS_PROMPT = BOOT_OS_PROMPT|default("root@iq-8075-evk") %}
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yocto uses machine-specific prompts, but qcom-deb-images does not; right now, it's always debian@debian; we'd like to change this in the future (Ubuntu support, device-specific hostnames), but for now I think you should hardcode debian@debian for qcom-deb-images.

This is a common file though; perhaps this should be an OS specific template instead, with a meta-qcom version and a qcom-deb-images version.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK. I can move it one level up - project setting, not a device-in-a-project setting

{% set ROOTFS_URL_COMP = ROOTFS_URL_COMP|default("gz") %}

{% set rootfs_label = 'rootfs' %}

{% block device_type %}iq-8075-evk{% endblock %}
9 changes: 9 additions & 0 deletions lava_test_plans/devices/unoq
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{% set PROJECT = PROJECT|default("") %}
{% extends PROJECT+"flasher.jinja2" %}

{% set BOOT_OS_PROMPT = BOOT_OS_PROMPT|default("root@uno-q") %}
{% set ROOTFS_URL_COMP = ROOTFS_URL_COMP|default("gz") %}

{% set rootfs_label = 'rootfs' %}

{% block device_type %}unoq{% endblock %}
3 changes: 3 additions & 0 deletions lava_test_plans/projects/qcom-deb-images/devices/lemans-evk
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{% extends "devices/iq-9075-evk" %}

{% set flasher_device_type = "debian-lemans-evk_ufs" %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{% set PROJECT = PROJECT|default("") %}
{% extends PROJECT+"flasher.jinja2" %}

{% set ROOTFS_URL_COMP = ROOTFS_URL_COMP|default("gz") %}

{% set rootfs_label = 'rootfs' %}

{% set flasher_device_type = "debian-monaco-arduino-monza_emmc" %}

{% block device_type %}ventunoq{% endblock %}
3 changes: 3 additions & 0 deletions lava_test_plans/projects/qcom-deb-images/devices/monaco-evk
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{% extends "devices/iq-8075-evk" %}

{% set flasher_device_type = "debian-monaco-evk_ufs" %}
3 changes: 3 additions & 0 deletions lava_test_plans/projects/qcom-deb-images/devices/qcs615-ride
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{% extends "devices/qcs615-ride" %}

{% set flasher_device_type = "debian-qcs615-ride_ufs" %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{% extends "devices/qcs6490-rb3gen2-core-kit" %}

{% set flasher_device_type = "debian-qcs6490-rb3gen2-vision-kit_ufs" %}

This file was deleted.

3 changes: 3 additions & 0 deletions lava_test_plans/projects/qcom-deb-images/devices/qcs8300-ride
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{% extends "devices/qcs8300-ride-sx" %}

{% set flasher_device_type = "debian-qcs8300-ride_ufs" %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{% extends "devices/qcs9100-ride-sx"%}

{% set flasher_device_type = "debian-qcs9100-ride-r3_ufs" %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{% extends "devices/unoq" %}

{% set flasher_device_type = "debian-qrb2210-arduino-imola_emmc" %}
3 changes: 3 additions & 0 deletions lava_test_plans/projects/qcom-deb-images/devices/qrb2210-rb1
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{% extends "devices/qrb2210-rb1-core-kit" %}

{% set flasher_device_type = "debian-qrb2210-rb1_emmc" %}

This file was deleted.

12 changes: 12 additions & 0 deletions lava_test_plans/projects/qcom-deb-images/flasher.jinja2
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{% extends "include/flasher.jinja2" %}

{% set device_type = "debian-" + device_type %}
{% set ADDITIONAL_POSTPROCESS_STEPS = ['echo "ROOTFS_IMAGE=disk-sdcard.img2" >> $IMAGE_PATH/flash.settings'] %}
{% set BOOT_OS_PROMPT = BOOT_OS_PROMPT|default("root@debian") %}

{% block deploy_target %}
{{ super() }}
Expand All @@ -14,5 +16,15 @@ metadata:
{% endblock metadata %}

{% block context %}
lava_test_results_dir: /home/lava-%s
test_character_delay: 10
{% endblock context %}

{% block auto_login_commands %}
login_commands:
- "debian"
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI, this might get stepped on by qualcomm-linux/qcom-deb-images#316

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess you should send a patch when you expect it to be merged.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was expecting:

  • debian
  • debian
  • debian
  • new password
  • new password

The first two being login + password, the third one being password again before changing password, and the new password lines being the one + confirmation.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

login+password (initial login) is handled by auto_login section. So this part only takes care of changing the password on 1st login.

- "new password"
- "new password"
- sudo su
{% endblock auto_login_commands %}

Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
build-url: {{BUILD_URL | default('')}}
kernel-series: {{KERNEL_SERIES | default('')}}

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion lava_test_plans/testplans/qcom-deb-images/boot.yaml

This file was deleted.

1 change: 1 addition & 0 deletions lava_test_plans/testplans/qcom-deb-images/boot/boot.yaml
5 changes: 4 additions & 1 deletion test/test_lava_test_plans.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,10 @@ def test_call_lava_test_plan_testplans_project_meta_qcom(param):
for d in glob.glob("lava_test_plans/projects/qcom-deb-images/devices/*")
]
assert len(qcom_deb_images_devices) > 0
qcom_deb_images_testplans = ["qcom-deb-images"]
qcom_deb_images_testplans = [
"qcom-deb-images/boot",
"qcom-deb-images/pre-merge",
]
assert len(qcom_deb_images_testplans) > 0
qcom_deb_images_variable_input_file = "projects/qcom-deb-images/variables.yaml"
tests = []
Expand Down
Loading