diff --git a/.github/workflows/test-plans-pipeline.yml b/.github/workflows/test-plans-pipeline.yml index e09ccb98..bc03d609 100644 --- a/.github/workflows/test-plans-pipeline.yml +++ b/.github/workflows/test-plans-pipeline.yml @@ -7,14 +7,14 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.6] + python-version: ['3.12'] steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v6 with: - python-version: '3.x' + python-version: ${{ matrix.python-version}} - name: Install deps run: | @@ -23,7 +23,7 @@ jobs: pip install flit pip install tuxpkg pip install py - pip install pytest==8.0.0 + pip install pytest==8.4.2 pip install pytest-cov pip install pytest-parallel export FLIT_ROOT_INSTALL=1 diff --git a/Makefile b/Makefile index 74fd9de9..f8503f58 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ all: typecheck test style flake8 export PROJECT := lava-test-plans -export NUM_WORKERS ?= $(shell nproc) +#export NUM_WORKERS ?= $(shell nproc) export TUXPKG_MIN_COVERAGE ?= 57 include $(shell tuxpkg get-makefile) diff --git a/README.md b/README.md index 05c3a531..03634f04 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -![Build Status](https://github.com/Linaro/lava-test-plans/actions/workflows/test-plans-pipeline.yml/badge.svg) -![REUSE Compliance Check](https://github.com/Linaro/lava-test-plans/actions/workflows/reuse.yml/badge.svg) +![Build Status](https://github.com/qualcomm-linux/lava-test-plans/actions/workflows/test-plans-pipeline.yml/badge.svg) +![REUSE Compliance Check](https://github.com/qualcomm-linux/lava-test-plans/actions/workflows/reuse.yml/badge.svg) # lava-test-plans @@ -8,18 +8,10 @@ It generates the LAVA job definition file from a set of templates. # Installation -Install lava-test-plans from pip: +Install lava-test-plans from this repository - lava-test-plans -h - -or - -via podman/docker: - - docker run -i -t lavasoftware/lava-test-plans /bin/bash - -lavasoftware/lava-test-plans:latest points to the latest released version. -lavasoftware/lava-test-plans:master points to the latest development. + virtualenv -p python3 venv + pip install . If the above commands succeed, you can run to check that the program starts correctly @@ -29,25 +21,9 @@ If the above commands succeed, you can run to check that the program starts corr To install the latest development version: - git clone https://github.com/Linaro/lava-test-plans.git + git clone https://github.com/qualcomm-linux/lava-test-plans.git cd ./lava-test-plans - pip3 install flit - flit install --symlink - -or - -You need to do if you have docker installed: - - docker run --volume $HOME/path/to/lava-test-plans:/xyz -i -t lavasoftware/lava-test-plans /bin/bash - cd /xyz - -lavasoftware/lava-test-plans:latest points to the latest released version. -lavasoftware/lava-test-plans:master points to the latest development. - -There will be a directory with /lava-test-plans from either a "released" -version or directly from master. - If the above commands succeed, you can run to check that the program starts correctly python3 -m lava_test_plans -h @@ -96,11 +72,5 @@ Overall job timeout is a sum of action timeouts. There are 6 components: When LXC is not in use all *lxc_* timeouts are set to 0. *test_timeout* is defined for each test template. *target_* timeouts can be set separately for each device. -# CI for docker multiarch builds -lava-test-plans gets mirrored to gitlab -https://gitlab.com/Linaro/lava-test-plans to build multiarch docker containers -and publish them to https://hub.docker.com/r/lavasoftware/lava-test-plans, that -is why there is a .gitlab-ci.yml in this repository. - # Repository -Pull requests are welcome to https://github.com/linaro/lava-test-plans. +Pull requests are welcome to https://github.com/qualcomm-linux/lava-test-plans. diff --git a/lava_test_plans/__main__.py b/lava_test_plans/__main__.py index 784d4d11..2c24b418 100644 --- a/lava_test_plans/__main__.py +++ b/lava_test_plans/__main__.py @@ -23,7 +23,7 @@ StrictUndefined, make_logging_undefined, ) -from jinja2.exceptions import UndefinedError, TemplateSyntaxError +from jinja2.exceptions import UndefinedError, TemplateSyntaxError, TemplateNotFound from ruamel.yaml import YAML from ruamel.yaml.constructor import ( DuplicateKeyError, @@ -42,7 +42,7 @@ validate_variables, ) -FORMAT = "[%(funcName)16s() ] %(message)s" +FORMAT = "[%(module)s][%(funcName)16s() %(lineno)d ] %(message)s" logging.basicConfig(level=logging.INFO, format=FORMAT) logger = logging.getLogger(__name__) @@ -283,6 +283,11 @@ def main(): action="store_true", dest="dryrun", ) + parser.add_argument( + "--dry-run-path", + help="""Path to the directory where rendered templates will be saved""", + dest="dry_run_path", + ) parser.add_argument( "--test-lava-validity", help="""Test generated templates using LAVA container validator""", @@ -321,6 +326,8 @@ def main(): exit_code = 0 output_path = os.path.abspath(os.path.join(script_dirname, "..", "tmp")) + if args.dry_run_path: + output_path = os.path.abspath(args.dry_run_path) if not os.path.isabs(args.testplan_path): if not os.path.isdir(args.testplan_path): @@ -441,6 +448,12 @@ def main(): logger.error("Trying to render: %s" % testpath) logger.error("\tissue: %s" % e.message) exit_code = 1 + except TemplateNotFound as e: + logger.error("File not found") + logger.error(e.message) + exit_code = 1 + if exit_code != 0: + return exit_code if args.dryrun and lava_job is not None: testpath = os.path.join( output_path, args.device_type, os.path.basename(test) diff --git a/lava_test_plans/devices/e850-96 b/lava_test_plans/devices/e850-96 deleted file mode 100644 index 6e5d0b4d..00000000 --- a/lava_test_plans/devices/e850-96 +++ /dev/null @@ -1,12 +0,0 @@ -{% set PROJECT = PROJECT|default("") %} -{% extends PROJECT+"fastboot.jinja2" %} - -{% set DEPLOY_OS = DEPLOY_OS|default("oe") %} -{% set ROOTFS_URL_COMP = ROOTFS_URL_COMP|default("gz") %} - -{% set pre_os_command = false %} -{% set post_boot_command = true %} - -{% set rootfs_label = 'super' %} - -{% block device_type %}e850-96{% endblock %} diff --git a/lava_test_plans/devices/hi6220-hikey-r2 b/lava_test_plans/devices/hi6220-hikey-r2 deleted file mode 100644 index 7eda516b..00000000 --- a/lava_test_plans/devices/hi6220-hikey-r2 +++ /dev/null @@ -1,59 +0,0 @@ -{% set PROJECT = PROJECT|default("") %} -{% extends PROJECT+"fastboot.jinja2" %} - -{% set BOOT_OS_PROMPT = BOOT_OS_PROMPT|default("hikey:~") %} -{% set DEPLOY_OS = DEPLOY_OS|default("oe") %} -{% set PTABLE_URL = PTABLE_URL|default("http://images.validation.linaro.org/snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/69/hikey/release/ptable-linux-8g.img") %} -{% set ROOTFS_URL_COMP = ROOTFS_URL_COMP|default("gz") %} - -{% set boot_method = boot_method|default("grub") %} -{% set pre_power_command = pre_power_command|default(true) %} -{% set post_boot_command = post_boot_command|default(true) %} -{% set ptable = ptable|default(true) %} -{% set reboot_reset = reboot_reset|default(true) %} -{% set rootfs = rootfs|default(true) %} -{% set rootfs_label = rootfs_label|default("system") %} - -{% block device_type %}hi6220-hikey-r2{% endblock %} - -{% block auto_login_commands %} - login_commands: - # Become super user to run tests - - su -{% endblock auto_login_commands %} - -{% block boot_commands %} - commands: installed -{% endblock boot_commands %} - -{% block test_target %} -{% if enable_tests is defined and enable_tests %} -- test: - timeout: - minutes: 5 - definitions: - - from: inline - repository: - metadata: - format: Lava-Test Test Definition 1.0 - name: prep-tests - description: "Device preparation" - run: - steps: - # the image does not raise the interface itself - # force a DHCP request to avoid avahi using a zero conf address. - # - udhcpc - # - netstat - # - ip a - # - ifconfig - - df - - cat /sys/class/thermal/thermal_zone0/policy || true - - echo "power_allocator" > /sys/class/thermal/thermal_zone0/policy || true - - cat /sys/class/thermal/thermal_zone0/policy || true - - cat /sys/devices/system/cpu/cpufreq/policy0/scaling_available_frequencies | awk '{ print $(NF-1) }' > /sys/devices/system/cpu/cpufreq/policy0/scaling_max_freq - - cat /sys/devices/system/cpu/cpufreq/policy0/scaling_max_freq || true - name: prep-inline - path: inline/prep.yaml - {{ super() }} -{% endif %} -{% endblock test_target %} diff --git a/lava_test_plans/devices/hi960-hikey b/lava_test_plans/devices/hi960-hikey deleted file mode 100644 index f5777c4a..00000000 --- a/lava_test_plans/devices/hi960-hikey +++ /dev/null @@ -1,19 +0,0 @@ -{% set PROJECT = PROJECT|default("") %} -{% extends PROJECT+"fastboot.jinja2" %} - -{% set auto_login = auto_login|default(false) %} -{% set boot_method = boot_method|default("grub") %} -{% set pre_boot_command = pre_boot_command|default(true) %} -{% set pre_os_command = pre_os_command|default(true) %} -{% set pre_power_command = pre_power_command|default(true) %} -{% set post_boot_command = post_boot_command|default(true) %} -{% set ptable = ptable|default(false) %} -{% set reboot_reset = reboot_reset|default(true) %} -{% set rootfs = rootfs|default(true) %} -{% set rootfs_label = rootfs_label|default('system') %} - -{% block device_type %}hi960-hikey{% endblock %} - -{% block boot_commands %} - commands: installed -{% endblock boot_commands %} diff --git a/lava_test_plans/devices/iq-9075-evk b/lava_test_plans/devices/iq-9075-evk new file mode 100644 index 00000000..18c5201f --- /dev/null +++ b/lava_test_plans/devices/iq-9075-evk @@ -0,0 +1,9 @@ +{% set PROJECT = PROJECT|default("") %} +{% extends PROJECT+"flasher.jinja2" %} + +{% set BOOT_OS_PROMPT = BOOT_OS_PROMPT|default("root@iq-9075-evk") %} +{% set ROOTFS_URL_COMP = ROOTFS_URL_COMP|default("gz") %} + +{% set rootfs_label = 'rootfs' %} + +{% block device_type %}iq-9075-evk{% endblock %} diff --git a/lava_test_plans/devices/juno b/lava_test_plans/devices/juno deleted file mode 100644 index 46b654d4..00000000 --- a/lava_test_plans/devices/juno +++ /dev/null @@ -1,18 +0,0 @@ -{% set PROJECT = PROJECT|default("") %} -{% extends PROJECT+"nfs.jinja2" %} - -{% set DEPLOY_OS = DEPLOY_OS|default("oe") %} -{% set ROOTFS_URL_COMP = ROOTFS_URL_COMP|default("xz") %} - -{% set auto_login = true %} -{% set boot_method = "u-boot" %} -{% set rootfs_label="nfsrootfs" %} - -{% block context %} -{% endblock context %} - -{% block device_type %}juno{% endblock %} - -{% block boot_commands %} - commands: {{ target_boot_commands|default("norflash") }} -{% endblock boot_commands %} diff --git a/lava_test_plans/devices/juno-r2 b/lava_test_plans/devices/juno-r2 deleted file mode 100644 index 0a6f86a4..00000000 --- a/lava_test_plans/devices/juno-r2 +++ /dev/null @@ -1,51 +0,0 @@ -{% set PROJECT = PROJECT|default("") %} -{% extends PROJECT+"nfs.jinja2" %} - -{% set DEPLOY_OS = DEPLOY_OS|default("oe") %} -{% set ROOTFS_URL_COMP = ROOTFS_URL_COMP|default("xz") %} - -{% set auto_login = true %} -{% set boot_method = "u-boot" %} -{% set rootfs_label="nfsrootfs" %} -{% set use_context = true %} - -{% block context %} - bootloader_prompt: juno# -{% endblock context %} - -{% block device_type %}juno-r2{% endblock %} - -{% block boot_commands %} - commands: nfs -{% endblock boot_commands %} - -{% block kernel_extra_args %} - type: image -{% endblock kernel_extra_args %} - -{% block test_target %} -{% if enable_tests is defined and enable_tests %} -- test: - timeout: - minutes: 5 - definitions: - - from: inline - repository: - metadata: - format: Lava-Test Test Definition 1.0 - name: prep-tests - description: "Device preparation" - run: - steps: - - export STORAGE_DEV=$(lava-target-storage SATA || lava-target-storage USB) - - test -n "${STORAGE_DEV}" || lava-test-raise "STORAGE_DEV not found; job exit" - - echo "y" | mkfs.ext4 ${STORAGE_DEV} || lava-test-raise "mkfs.ext4 ${STORAGE_DEV} failed; job exit" - - mkdir -p /scratch - - mount ${STORAGE_DEV} /scratch && echo "mounted" || lava-test-raise "mount ${STORAGE_DEV} failed; job exit" - - df -h - - mount - name: prep-inline - path: inline/prep.yaml - {{ super() }} -{% endif %} -{% endblock test_target %} diff --git a/lava_test_plans/devices/qcs615-adp-air b/lava_test_plans/devices/qcs615-adp-air new file mode 100644 index 00000000..79804f2b --- /dev/null +++ b/lava_test_plans/devices/qcs615-adp-air @@ -0,0 +1,9 @@ +{% set PROJECT = PROJECT|default("") %} +{% extends PROJECT+"flasher.jinja2" %} + +{% set BOOT_OS_PROMPT = BOOT_OS_PROMPT|default("root@qcs615-adp-air") %} +{% set ROOTFS_URL_COMP = ROOTFS_URL_COMP|default("gz") %} + +{% set rootfs_label = 'rootfs' %} + +{% block device_type %}qcs615-adp-air{% endblock %} diff --git a/lava_test_plans/devices/qcs6490-rb3gen2-core-kit b/lava_test_plans/devices/qcs6490-rb3gen2-core-kit new file mode 100644 index 00000000..14aab3fc --- /dev/null +++ b/lava_test_plans/devices/qcs6490-rb3gen2-core-kit @@ -0,0 +1,9 @@ +{% set PROJECT = PROJECT|default("") %} +{% extends PROJECT+"flasher.jinja2" %} + +{% set BOOT_OS_PROMPT = BOOT_OS_PROMPT|default("root@qcs6490-rb3gen2-core-kit") %} +{% set ROOTFS_URL_COMP = ROOTFS_URL_COMP|default("gz") %} + +{% set rootfs_label = 'rootfs' %} + +{% block device_type %}qcs6490-rb3gen2-core-kit{% endblock %} diff --git a/lava_test_plans/devices/qcs8300-ride-sx b/lava_test_plans/devices/qcs8300-ride-sx new file mode 100644 index 00000000..60d0c15b --- /dev/null +++ b/lava_test_plans/devices/qcs8300-ride-sx @@ -0,0 +1,9 @@ +{% set PROJECT = PROJECT|default("") %} +{% extends PROJECT+"flasher.jinja2" %} + +{% set BOOT_OS_PROMPT = BOOT_OS_PROMPT|default("root@qcs8300-ride-sx") %} +{% set ROOTFS_URL_COMP = ROOTFS_URL_COMP|default("gz") %} + +{% set rootfs_label = 'rootfs' %} + +{% block device_type %}qcs8300-ride-sx{% endblock %} diff --git a/lava_test_plans/devices/qcs9100-ride-sx b/lava_test_plans/devices/qcs9100-ride-sx new file mode 100644 index 00000000..ada794c5 --- /dev/null +++ b/lava_test_plans/devices/qcs9100-ride-sx @@ -0,0 +1,9 @@ +{% set PROJECT = PROJECT|default("") %} +{% extends PROJECT+"flasher.jinja2" %} + +{% set BOOT_OS_PROMPT = BOOT_OS_PROMPT|default("root@qcs9100-ride-sx") %} +{% set ROOTFS_URL_COMP = ROOTFS_URL_COMP|default("gz") %} + +{% set rootfs_label = 'rootfs' %} + +{% block device_type %}qcs9100-ride-sx{% endblock %} diff --git a/lava_test_plans/devices/qrb2210-rb1-core-kit b/lava_test_plans/devices/qrb2210-rb1-core-kit new file mode 100644 index 00000000..abfc3f6d --- /dev/null +++ b/lava_test_plans/devices/qrb2210-rb1-core-kit @@ -0,0 +1,9 @@ +{% set PROJECT = PROJECT|default("") %} +{% extends PROJECT+"flasher.jinja2" %} + +{% set BOOT_OS_PROMPT = BOOT_OS_PROMPT|default("root@qrb2210-rb1-core-kit") %} +{% set ROOTFS_URL_COMP = ROOTFS_URL_COMP|default("gz") %} + +{% set rootfs_label = 'rootfs' %} + +{% block device_type %}qrb2210-rb1-core-kit{% endblock %} diff --git a/lava_test_plans/devices/rk3399-rock-pi-4b b/lava_test_plans/devices/rk3399-rock-pi-4b deleted file mode 100644 index 92d92920..00000000 --- a/lava_test_plans/devices/rk3399-rock-pi-4b +++ /dev/null @@ -1,24 +0,0 @@ -{% set PROJECT = PROJECT|default("") %} -{% extends PROJECT+"nfs.jinja2" %} - -{% set DEPLOY_OS = DEPLOY_OS|default("debian") %} - -{% set auto_login = true %} -{% set boot_method = "u-boot" %} -{% set EXTRA_KERNEL_ARGS = 'console=ttyFIQ0,1500000n8 rootwait' + EXTRA_KERNEL_ARGS|default("") %} -{% set rootfs_label="nfsrootfs" %} -{% set use_context = true %} - -{% block context %} - arch: arm64 -{% endblock context %} - -{% block device_type %}rk3399-rock-pi-4b{% endblock %} - -{% block boot_commands %} - commands: nfs -{% endblock boot_commands %} - -{% block kernel_extra_args %} - type: image -{% endblock kernel_extra_args %} diff --git a/lava_test_plans/devices/rzn1d b/lava_test_plans/devices/rzn1d deleted file mode 100644 index 7c4b1e3f..00000000 --- a/lava_test_plans/devices/rzn1d +++ /dev/null @@ -1,36 +0,0 @@ -{% set PROJECT = PROJECT|default("") %} -{% extends PROJECT+"nfs.jinja2" %} - -{% set AUTO_LOGIN_PASSWORD_PROMPT = "Password:" %} -{% set AUTO_LOGIN_PASSWORD = "P@ssword-1" %} -{% set BOOT_OS_PROMTP = "root@rzn1-snarc:" %} - -{% set auto_login = auto_login|default(true) %} -{% set boot_method = boot_method|default("u-boot") %} -{% set run_nand_commands = true %} -{% set run_tftp_commands = true %} -{% set TARGET_BOOT_TIMEOUT = 10 %} -{% set target_deploy_timeout = 5 %} - -{% block device_type %}rzn1d{% endblock %} - -{% block kernel_extra_args %} - type: uimage -{% endblock kernel_extra_args %} - -{% block boot_commands %} -{% if boot_method == "u-boot" %} - commands: - - setenv autoload no - - dhcp - - dhcp - - env print - - setenv serverip {SERVER_IP} - - tftp {KERNEL_ADDR} {KERNEL} - - run LINUX_BOOTARGS - - bootm {KERNEL_ADDR}#conf@1 -{% elif boot_method == "bootloader" %} - bootloader: u-boot - commands: [] -{% endif %} -{% endblock boot_commands %} diff --git a/lava_test_plans/devices/soca9 b/lava_test_plans/devices/soca9 deleted file mode 100644 index 08f14f78..00000000 --- a/lava_test_plans/devices/soca9 +++ /dev/null @@ -1,59 +0,0 @@ -{% set PROJECT = PROJECT|default("") %} -{% extends PROJECT+"nfs.jinja2" %} - -{% set AUTO_LOGIN_PASSWORD_PROMPT = "Password:" %} -{% set AUTO_LOGIN_PASSWORD = "P@ssword-1" %} -{% set BOOT_OS_PROMPT = ["Current password: ", "New password: ", "Retype new password: ", "root@snarc-soca9:"] %} - -{% set auto_login = auto_login|default(true) %} -{% set boot_method = boot_method|default("u-boot") %} -{% set rootfs_label = "nfsrootfs" %} -{% set run_fpga_commands = false %} -{% set run_tftp_commands = true %} -{% set target_deploy_timeout = 5 %} - -{% block device_type %}soca9{% endblock %} - -{% block deploy_target %} -- deploy: - timeout: - minutes: 10 - to: flasher - images: - image: - url: https://images.validation.linaro.org/people.linaro.org/~remi.duraffort/soca9-disk.img.bz2 - compression: bz2 -{{ super() }} -{% endblock deploy_target %} - -{% block kernel_extra_args %} - type: zimage -{% endblock kernel_extra_args %} - -{% block boot_commands %} -{% if boot_method == "u-boot" %} - commands: - - run FPGA_INIT - - setenv autoload no - - dhcp - - dhcp - - env print - - setenv serverip {SERVER_IP} - - tftp 0x01000000 {KERNEL} - - tftp 0x00000100 {DTB} - - "setenv bootargs 'console=ttyS0,115200n8 root=/dev/nfs rw nfsroot={NFS_SERVER_IP}:{NFSROOTFS},tcp,hard,intr,vers=3 rootwait coherent_pool=2M ip=dhcp'" - - '{BOOTX}' -{% elif boot_method == "bootloader" %} - bootloader: u-boot - commands: [] -{% endif %} -{% endblock boot_commands %} - -{% block auto_login_commands %} - login_commands: - - P@ssword-1 - - azertAZERT12345 - - azertAZERT12345 - - azertAZERT12345 -{% endblock auto_login_commands %} - diff --git a/lava_test_plans/devices/stm32mp157c-dk2 b/lava_test_plans/devices/stm32mp157c-dk2 deleted file mode 100644 index 6408b3ae..00000000 --- a/lava_test_plans/devices/stm32mp157c-dk2 +++ /dev/null @@ -1,18 +0,0 @@ -{% set PROJECT = PROJECT|default("") %} -{% extends PROJECT+"qemu.jinja2" %} - -{% set DOWNLOAD_COMMANDS = DOWNLOAD_COMMANDS|default("udhcpc; cd /tmp; wget") %} -{% set UNPACK_COMMANDS = UNPACK_COMMANDS|default("tar -C / -xzf") %} -{% set DEPLOY_OS = DEPLOY_OS|default("oe") %} -{% set BOOT_OS_PROMPT = BOOT_OS_PROMPT|default("root@stm32mp1") %} -{% set DEPLOY_TARGET = DEPLOY_TARGET|default("flasher") %} - -{% set boot = boot|default(false) %} -{% set use_context = use_context|default(false) %} -{% set flasher = flasher|default(true) %} -{% set guestfs_virtio = guestfs_virtio|default(false) %} -{% set rootfs = rootfs|default(false) %} -{% set boot_method = boot_method|default("minimal") %} -{% set auto_login = auto_login|default(false) %} - -{% block device_type %}stm32mp157c-dk2{% endblock %} diff --git a/lava_test_plans/devices/synquacer b/lava_test_plans/devices/synquacer deleted file mode 100644 index 820caf85..00000000 --- a/lava_test_plans/devices/synquacer +++ /dev/null @@ -1,19 +0,0 @@ -{% set PROJECT = PROJECT|default("") %} -{% extends PROJECT+"nfs.jinja2" %} - -{% set auto_login = true %} -{% set boot_method = "grub" %} -{% set rootfs_label="nfsrootfs" %} -{% set use_context = true %} - -{% block context %} - test_character_delay: 10 -{% endblock context %} - -{% block device_type %}synquacer{% endblock %} - -{% block boot_commands %} - commands: nfs - parameters: - shutdown-message: "reboot: Restarting system" -{% endblock boot_commands %} diff --git a/lava_test_plans/devices/thunderx b/lava_test_plans/devices/thunderx deleted file mode 100644 index 1dc899b3..00000000 --- a/lava_test_plans/devices/thunderx +++ /dev/null @@ -1,30 +0,0 @@ -{% set PROJECT = PROJECT|default("") %} -{% extends PROJECT+"nfs.jinja2" %} - -{% set BOOT_OS_PROMPT = BOOT_OS_PROMPT|default("root@thunderx:") %} -{% set DEPLOY_OS = DEPLOY_OS|default("oe") %} -{% set ROOTFS_URL_COMP = ROOTFS_URL_COMP|default("xz") %} -{% set RAMDISK_URL = RAMDISK_URL|default("ramdisk-url") %} -{% set RAMDISK_URL_COMP = RAMDISK_URL_COMP|default("gz") %} - -{% set auto_login = true %} -{% set boot_method = "grub" %} -{% set rootfs_label="nfsrootfs" %} -{% set use_context = true %} - -{% block context %} - test_character_delay: 10 -{% endblock context %} - -{% block device_type %}thunderx{% endblock %} - -{% block boot_commands %} - commands: nfs - parameters: - shutdown-message: "reboot: Restarting system" -{% endblock boot_commands %} - -{% block auto_login_commands %} - login_commands: - - su -{% endblock auto_login_commands %} diff --git a/lava_test_plans/devices/variables/rk3399-rock-pi-4b.yaml b/lava_test_plans/devices/variables/rk3399-rock-pi-4b.yaml deleted file mode 100644 index bc7e9892..00000000 --- a/lava_test_plans/devices/variables/rk3399-rock-pi-4b.yaml +++ /dev/null @@ -1,7 +0,0 @@ -DEVICE_TYPE: rk3399-rock-pi-4b -KERNEL_URL: unknown -DTB_URL: unknown -BOOT_URL: unknown -MODULES_URL: unknown -ROOTFS_URL: unknown -LAVA_JOB_PRIORITY: 25 diff --git a/lava_test_plans/devices/variables/x15.yaml b/lava_test_plans/devices/variables/x15.yaml deleted file mode 100644 index d2c45f8e..00000000 --- a/lava_test_plans/devices/variables/x15.yaml +++ /dev/null @@ -1,7 +0,0 @@ -DEVICE_TYPE: x15 -KERNEL_URL: unknown -DTB_URL: unknown -BOOT_URL: unknown -MODULES_URL: unknown -ROOTFS_URL: unknown -LAVA_JOB_PRIORITY: 25 diff --git a/lava_test_plans/devices/x15 b/lava_test_plans/devices/x15 deleted file mode 100644 index 3708ef19..00000000 --- a/lava_test_plans/devices/x15 +++ /dev/null @@ -1,55 +0,0 @@ -{% set PROJECT = PROJECT|default("") %} -{% extends PROJECT+"fastboot.jinja2" %} - -{% set DEPLOY_OS = DEPLOY_OS|default("oe") %} -{% set ROOTFS_URL_COMP = ROOTFS_URL_COMP|default("gz") %} - -{% set boot_method = boot_method|default("u-boot") %} -{# libhugetlbfs_word_size variable is required for libhugetlbfs.yaml test template #} -{% set libhuggetlbfs_word_size = 32 %} -{% set pre_boot_command = false %} -{% set pre_os_command = false %} -{% set pre_power_command = false %} -{% set reboot_to_fastboot = reboot_to_fastboot|default("true") %} -{% set rootfs_label = "super" %} - -{% block device_type %}x15{% endblock %} - -{% block boot_commands %} - commands: - - setenv fdtfile am57xx-beagle-x15.dtb - - setenv console ttyS2,115200n8 - - setenv mmcdev 1 - - part number mmc 1 {{ rootfs_label }} part_num - - "setenv bootpart 1:${part_num}" - - run mmcboot -{% endblock boot_commands %} - -{% block test_target %} -{% if enable_tests is defined and enable_tests %} -- test: - timeout: - minutes: 5 - definitions: - - from: inline - repository: - metadata: - format: Lava-Test Test Definition 1.0 - name: prep-tmp-disk - description: "Mount local disk for tmp space" - run: - steps: -{% if SKIPGEN_KERNEL_VERSION != '4.4' or SKIPGEN_KERNEL_VERSION != 'linux-4.4.y' %} - - export STORAGE_DEV=$(lava-target-storage SATA || lava-target-storage USB) - - test -n "${STORAGE_DEV}" || lava-test-raise "STORAGE_DEV not found; job exit" - - echo "y" | mkfs.ext4 ${STORAGE_DEV} || lava-test-raise "mkfs.ext4 ${STORAGE_DEV} failed; job exit" - - mkdir -p /scratch - - mount ${STORAGE_DEV} /scratch && echo "mounted" || lava-test-raise "mount ${STORAGE_DEV} failed; job exit" -{% endif %} - - df -h - - mount - name: prep-tmp-disk - path: inline/prep.yaml - {{ super() }} -{% endif %} -{% endblock test_target %} diff --git a/lava_test_plans/devices/x15-bl b/lava_test_plans/devices/x15-bl deleted file mode 100644 index ddae8995..00000000 --- a/lava_test_plans/devices/x15-bl +++ /dev/null @@ -1,39 +0,0 @@ -{% set PROJECT = PROJECT|default("") %} -{% extends PROJECT+"fastboot.jinja2" %} - -{% set boot_method = boot_method|default("u-boot") %} -{# libhugetlbfs_word_size variable is required for libhugetlbfs.yaml test template #} -{% set libhuggetlbfs_word_size = 32 %} -{% set pre_boot_command = false %} -{% set pre_os_command = false %} -{% set rootfs_label = "userdata" %} - -{% block device_type %}x15-bl{% endblock %} - -{% block boot_commands %} -{% if boot_method == "u-boot" %} - commands: {{ BOOT_COMMANDS|default("ramdisk") }} -{% elif boot_method == "bootloader" %} - bootloader: u-boot - commands: [] -{% endif %} -{% endblock boot_commands %} - - -{% if boot_method == "bootloader" %} -{% block protocols %} -{% endblock protocols %} -{% block lxc %} -{% endblock lxc %} -{% block deploy_target %} -- deploy: - timeout: - minutes: 10 - to: flasher - images: - image: - url: {{ IMAGE_URL }} - compression: {{ IMAGE_COMP }} -{% endblock deploy_target %} - -{% endif %} diff --git a/lava_test_plans/flasher.jinja2 b/lava_test_plans/flasher.jinja2 new file mode 100644 index 00000000..fb67e0ea --- /dev/null +++ b/lava_test_plans/flasher.jinja2 @@ -0,0 +1,10 @@ +{% extends "include/flasher.jinja2" %} + +{% block deploy_target %} +{{ super() }} +{% endblock deploy_target %} + +{% block context %} + lava_test_results_dir: /home/lava-%s + test_character_delay: 10 +{% endblock context %} diff --git a/lava_test_plans/include/auth-header.jinja2 b/lava_test_plans/include/auth-header.jinja2 new file mode 100644 index 00000000..1feecc28 --- /dev/null +++ b/lava_test_plans/include/auth-header.jinja2 @@ -0,0 +1,5 @@ + {% if AUTH_HEADER_NAME is defined and AUTH_HEADER_TOKEN is defined %} + headers: + {{ AUTH_HEADER_NAME }}: {{ AUTH_HEADER_TOKEN }} + {% endif %} + diff --git a/lava_test_plans/include/fastboot.jinja2 b/lava_test_plans/include/fastboot.jinja2 index d804f382..ed2e5dc4 100644 --- a/lava_test_plans/include/fastboot.jinja2 +++ b/lava_test_plans/include/fastboot.jinja2 @@ -305,7 +305,9 @@ reboot_to_fastboot: {{ reboot_to_fastboot }} compression: {{ USERDATA_URL_COMP }} {% endif %} {% endif %} +{% if DEPLOY_OS %} os: {{DEPLOY_OS}} +{% endif %} {% if lxc_project == false and download_postprocess_required == true %} postprocess: docker: diff --git a/lava_test_plans/include/flasher.jinja2 b/lava_test_plans/include/flasher.jinja2 new file mode 100644 index 00000000..d937e84b --- /dev/null +++ b/lava_test_plans/include/flasher.jinja2 @@ -0,0 +1,83 @@ +{% extends "master.jinja2" %} + +{% set use_context = true %} +{% set DOCKER_IMAGE_DEPLOY = DOCKER_IMAGE_DEPLOY|default("debian:buster") %} +{% set DOCKER_IMAGE_POSTPROCESS = DOCKER_IMAGE_POSTPROCESS|default("debian:buster") %} +{% set IMAGE_FILE_NAME = IMAGE_FILE_NAME|default("rootfs.tar.gz") %} +{% set pre_boot_command = pre_boot_command|default(false) %} +{% set pre_power_command = pre_power_command|default(false) %} +{% set pre_os_command = pre_os_command|default(false) %} +{% set auto_login = auto_login|default(true) %} +{% set boot_method = boot_method|default("minimal") %} +{% set use_download_headers = use_download_headers|default(false) %} + +{% set download_postprocess_required = download_postprocess_required|default(true) %} + +{% set DEPLOY_TARGET = DEPLOY_TARGET|default("flasher") %} + +{% block actions %} +{% block deploy_target %} + +{% if enable_tests is defined and enable_tests %} +{% set apply_overlay = "rootfs" %} +{% endif %} + +- deploy: + timeout: + minutes: {{ target_downloads_timeout }} + to: downloads + images: + flasher: + url: {{ ROOTFS_URL }} +{% if use_download_headers %} + {% include PROJECT+"include/auth-header.jinja2" %} +{% endif %} +{% if download_postprocess_required == true %} + postprocess: + docker: + image: {{DOCKER_IMAGE_POSTPROCESS}} + local: true +{% include "include/postprocess.jinja2" %} +{% endif %} +- deploy: + timeout: + minutes: {{ target_deploy_timeout }} + to: {{ DEPLOY_TARGET }} + images: + image: + url: downloads://{{ IMAGE_FILE_NAME }} +{% if download_postprocess_required == true %} +{# flash.settings file is generated by postprocess commands #} + settings: + url: downloads://flash.settings +{% endif %} +{% if apply_overlay is defined and apply_overlay == "rootfs" %} + overlay: + url: downloads://overlay.tar.gz +{% endif %} +{% endblock deploy_target %} + +{% block pre_boot_command %} +{% include "include/boot_target/pre_boot_commands.jinja2" %} +{% endblock pre_boot_command %} + +{% block boot_target %} +- boot: +{% block boot_commands %} +{% endblock boot_commands %} +{% if auto_login == true %} +{% include "include/boot_target/auto_login.jinja2" %} +{% block auto_login_commands %} +{% include "include/boot_target/auto_login_commands.jinja2" %} +{% endblock auto_login_commands %} +{% endif %} +{% include "include/boot_target/boot_target.jinja2" %} +{% endblock boot_target %} + +{% block post_boot_command %} +{% include "include/boot_target/post_boot_command.jinja2" %} +{% endblock post_boot_command %} + +{{ super() }} + +{% endblock actions %} diff --git a/lava_test_plans/include/postprocess.jinja2 b/lava_test_plans/include/postprocess.jinja2 new file mode 100644 index 00000000..2eed7cb0 --- /dev/null +++ b/lava_test_plans/include/postprocess.jinja2 @@ -0,0 +1,9 @@ + steps: + - export IMAGE_PATH=$PWD +{% if apply_overlay is defined and apply_overlay == "rootfs" %} + - cp overlay*.tar.gz overlay.tar.gz + - echo "OVERLAY=overlay.tar.gz" >> $IMAGE_PATH/flash.settings + - echo "OVERLAY_PATH=/home/" >> $IMAGE_PATH/flash.settings +{% endif %} + - echo "DEVICE_TYPE={{device_type}}" >> $IMAGE_PATH/flash.settings + - cat $IMAGE_PATH/flash.settings diff --git a/lava_test_plans/master.jinja2 b/lava_test_plans/master.jinja2 index 1635d2ec..2c97a88d 100644 --- a/lava_test_plans/master.jinja2 +++ b/lava_test_plans/master.jinja2 @@ -6,11 +6,17 @@ {% set install_fastboot_timeout = install_fastboot_timeout|default(10) %} {# fastboot_deploy_timeout is for 'to: fastboot' targets only #} {% set fastboot_deploy_timeout = fastboot_deploy_timeout|default(0) %} +{% set target_downloads_timeout = target_deploy_timeout|default(20) %} {% set target_deploy_timeout = target_deploy_timeout|default(40) %} {% set TARGET_BOOT_TIMEOUT = TARGET_BOOT_TIMEOUT|default(15)|int %} {% set test_timeout = test_timeout|default(60) %} {% set TEST_DEFINITIONS_REPOSITORY = TEST_DEFINITIONS_REPOSITORY|default("https://github.com/Linaro/test-definitions.git") %} +{# if AUTH_HEADER_NAME and AUTH_HEADER_TOKEN are set, populate use_download_headers #} +{% if AUTH_HEADER_NAME is defined and AUTH_HEADER_TOKEN is defined %} +{% set use_download_headers = true %} +{% endif %} + {% if lxc_project == true %} {% set job_timeout = deploy_timeout + boot_timeout + install_fastboot_timeout + fastboot_deploy_timeout + target_deploy_timeout + TARGET_BOOT_TIMEOUT + test_timeout %} {% else %} diff --git a/lava_test_plans/projects/armnn/fastboot.jinja2 b/lava_test_plans/projects/armnn/fastboot.jinja2 deleted file mode 100644 index b1b46593..00000000 --- a/lava_test_plans/projects/armnn/fastboot.jinja2 +++ /dev/null @@ -1,5 +0,0 @@ -{% extends "include/fastboot.jinja2" %} - -{% block metadata %} -{% include PROJECT+"include/armnn-metadata.jinja2" %} -{% endblock metadata %} diff --git a/lava_test_plans/projects/armnn/include/armnn-metadata.jinja2 b/lava_test_plans/projects/armnn/include/armnn-metadata.jinja2 deleted file mode 100644 index a168f1dc..00000000 --- a/lava_test_plans/projects/armnn/include/armnn-metadata.jinja2 +++ /dev/null @@ -1 +0,0 @@ - build-url: {{BUILD_URL | default('""')}} diff --git a/lava_test_plans/projects/armnn/nfs.jinja2 b/lava_test_plans/projects/armnn/nfs.jinja2 deleted file mode 100644 index 82317a88..00000000 --- a/lava_test_plans/projects/armnn/nfs.jinja2 +++ /dev/null @@ -1,9 +0,0 @@ -{% extends "nfs.jinja2" %} - -{% block metadata %} -{% include PROJECT+"include/armnn-metadata.jinja2" %} -{% endblock metadata %} - -{% block rootfs_extra_args %} - prefix: binary/ -{% endblock rootfs_extra_args %} diff --git a/lava_test_plans/projects/armnn/qemu.jinja2 b/lava_test_plans/projects/armnn/qemu.jinja2 deleted file mode 100644 index cf910103..00000000 --- a/lava_test_plans/projects/armnn/qemu.jinja2 +++ /dev/null @@ -1,5 +0,0 @@ -{% extends "qemu.jinja2" %} - -{% block metadata %} -{% include PROJECT+"include/armnn-metadata.jinja2" %} -{% endblock metadata %} diff --git a/lava_test_plans/projects/armnn/variables.yaml b/lava_test_plans/projects/armnn/variables.yaml deleted file mode 100644 index ed1ce5bb..00000000 --- a/lava_test_plans/projects/armnn/variables.yaml +++ /dev/null @@ -1,24 +0,0 @@ -"PROJECT_NAME": "test" -"BUILD_URL": "build-url" -"BOOT_URL": "boot-url" -"SYSTEM_URL": "system-url" -"DEVICE_TYPE": "device-type" -"BUILD_NUMBER": "123" -"LAVA_JOB_PRIORITY": "99" -"ROOTFS_URL": "variable-value" -"# ROOTFS_URL_FORMAT": "variable-value" -"ROOTFS_URL_COMP": "gz" -"DEPLOY_OS": "debian" -"DOCKER_ROOTFS_FILE": "docker-rootfs-file" -"BOOT_OS_PROMPT": "variable-value" -"QA_SERVER_PROJECT": "qa-server-project" -# ARMNN -"ARMNN_TARBALL_URL": "https://snapshots.linaro.org/components/armnn/123/armnn.tar.xz" -"PROJECT": "projects/armnn/" -"PTABLE_URL": "ptable-url" -"KERNEL_URL": "kernel-url" -"RAMDISK_URL": "ramdisk-url" -"TARBALL_URL": "https://snapshots.linaro.org/components/armnn/123/ArmFin.tar.xz" -"LAYOUT_URL": "https://snapshots.linaro.org/components/armnn/123/aiLayout-optee.tsv" -# misc variables -"ARTIFACTORIAL_TOKEN": "1234abcd" diff --git a/lava_test_plans/projects/lkft-android/devices/dragonboard-845c b/lava_test_plans/projects/lkft-android/devices/dragonboard-845c deleted file mode 100644 index ef49304c..00000000 --- a/lava_test_plans/projects/lkft-android/devices/dragonboard-845c +++ /dev/null @@ -1,34 +0,0 @@ -{% extends "devices/dragonboard-845c" %} - -{% set TAGS = TAGS|default(["lcg"]) %} - -{# to avoid overriding by the one definied in testcases #} -{# like the one definied in testcases/boot.yaml is true by default #} -{% set auto_login = false %} -{% set boot_method = "fastboot" %} -{% set pre_boot_command = false %} -{% set pre_os_command = false %} -{% set pre_power_command = false %} -{% set post_boot_command = false %} -{% set reboot_reset = false %} -{% set rootfs = false %} - -{% set BOOT_OS_PROMPT = BOOT_OS_PROMPT|default(["console:/"]) %} -{% set FASTBOOT_COMMANDS = FASTBOOT_COMMANDS|default(["format:ext4 metadata", "oem select-display-panel hdmi", "reboot bootloader", "oem select-display-panel hdmi", "reboot bootloader", "oem select-display-panel hdmi", "reboot"]) %} -{% set DOCKER_PTABLE_FILE = DOCKER_PTABLE_FILE|default("gpt_both0.bin") %} -{% set PTABLE_URL = PTABLE_URL|default("https://images.validation.linaro.org/snapshots.linaro.org/96boards/dragonboard845c/linaro/rescue/101/dragonboard-845c-bootloader-ufs-aosp-101/gpt_both0.bin") %} - -{% set partition_super = true %} -{% set partition_userdata = true %} - -{% if IMAGE_SUPPORTED_VENDOR_BOOT is defined and IMAGE_SUPPORTED_VENDOR_BOOT == "true" %} - {% set partition_vendor_boot = true %} -{% endif%} - -{% if TUXSUITE_BAKE_VENDOR_DOWNLOAD_URL is defined %} -{% set download_postprocess_required = true %} -{% set partition_boot_with_postprocess = false %} -{% set partition_super_with_postprocess = false %} -{% set partition_vendor_boot_with_postprocess = false %} -{% set partition_userdata_with_postprocess = false %} -{% endif%} diff --git a/lava_test_plans/projects/lkft-android/devices/hi6220-hikey-r2 b/lava_test_plans/projects/lkft-android/devices/hi6220-hikey-r2 deleted file mode 100644 index 9b33147b..00000000 --- a/lava_test_plans/projects/lkft-android/devices/hi6220-hikey-r2 +++ /dev/null @@ -1,38 +0,0 @@ -{% extends "devices/hi6220-hikey-r2" %} - -{# to avoid overriding by the one definied in testcases #} -{# like the one defined in testcases/boot.yaml is set to true by default #} -{% set auto_login = false %} -{% set boot_method = "fastboot" %} -{% set pre_boot_command = false %} -{% set pre_os_command = false %} -{% set pre_power_command = false %} -{% set post_boot_command = false %} -{% set rootfs = false %} - -{% set BOOT_OS_PROMPT = BOOT_OS_PROMPT|default(["console:/"]) %} -{% set DOCKER_PTABLE_FILE = DOCKER_PTABLE_FILE|default("prm_ptable.img") %} -{% set PTABLE_URL = PTABLE_URL|default("http://testdata.linaro.org/lkft/aosp-stable/reference-platform/components/uefi-staging/123/hikey/release/prm_ptable.img") %} - -{% set partition_system = true %} -{% set partition_vendor = true %} -{% set partition_userdata = true %} - -{% if TUXSUITE_BAKE_VENDOR_DOWNLOAD_URL is defined %} -{% set download_postprocess_required = true %} -{% set partition_boot_with_postprocess = false %} -{% set partition_system_with_postprocess = false %} -{% set partition_vendor_with_postprocess = false %} -{% set partition_userdata_with_postprocess = false %} -{% endif%} - -{# override the blocks defined in "devices/hi6220-hikey" #} -{% block auto_login_commands %} -{% endblock auto_login_commands %} -{% block boot_commands %} -{% endblock boot_commands %} - -{# override the test_target block defined in "devices/hi6220-hikey" #} -{% block test_target %} -{% include "include/test_target.jinja2" %} -{% endblock test_target %} diff --git a/lava_test_plans/projects/lkft-android/devices/hi960-hikey b/lava_test_plans/projects/lkft-android/devices/hi960-hikey deleted file mode 100644 index 50041b73..00000000 --- a/lava_test_plans/projects/lkft-android/devices/hi960-hikey +++ /dev/null @@ -1,37 +0,0 @@ -{% extends "devices/hi960-hikey" %} - -{% set TAGS = TAGS|default(["old-firmware"]) %} - -{# to avoid overriding by the one definied in testcases #} -{# like the one defined in testcases/boot.yaml is set to true by default #} -{% set auto_login = false %} -{% set boot_method = "fastboot" %} -{% set pre_boot_command = false %} -{% set pre_os_command = false %} -{% set pre_power_command = false %} -{% set post_boot_command = false %} -{% set rootfs = false %} - -{% set BOOT_OS_PROMPT = BOOT_OS_PROMPT|default(["console:/"]) %} -{% set FASTBOOT_COMMANDS = FASTBOOT_COMMANDS|default(["format cache", "reboot bootloader"]) %} - -{% set ptable = true %} -{% set DOCKER_PTABLE_FILE = DOCKER_PTABLE_FILE|default("prm_ptable.img") %} -{% set PTABLE_URL = PRM_PTABLE_URL|default("http://testdata.linaro.org/lkft/aosp-stable/android/lkft/lkft-aosp-master-hikey960/555/prm_ptable.img") %} -{% set DOCKER_PTABLE_FILE = DOCKER_PRM_PTABLE_FILE|default("prm_ptable.img") %} - -{% set partition_super = true %} -{% set partition_userdata = true %} - -{% if TUXSUITE_BAKE_VENDOR_DOWNLOAD_URL is defined %} -{% set download_postprocess_required = true %} -{% set partition_boot_with_postprocess = false %} -{% set partition_super_with_postprocess = false %} -{% set partition_system_with_postprocess = false %} -{% set partition_vendor_with_postprocess = false %} -{% set partition_userdata_with_postprocess = false %} -{% endif%} - -{# override the boot_commands block defined in "devices/hi960-hikey" #} -{% block boot_commands %} -{% endblock boot_commands %} diff --git a/lava_test_plans/projects/lkft-android/devices/qrb5165-rb5 b/lava_test_plans/projects/lkft-android/devices/qrb5165-rb5 deleted file mode 100644 index 1dde0dc2..00000000 --- a/lava_test_plans/projects/lkft-android/devices/qrb5165-rb5 +++ /dev/null @@ -1,29 +0,0 @@ -{% extends "devices/qrb5165-rb5" %} - -{# to avoid overriding by the one definied in testcases #} -{# like the one definied in testcases/boot.yaml is true by default #} -{% set auto_login = false %} -{% set boot_method = "fastboot" %} -{% set pre_boot_command = false %} -{% set pre_os_command = false %} -{% set pre_power_command = false %} -{% set post_boot_command = false %} -{% set reboot_reset = false %} -{% set rootfs = false %} - -{% set BOOT_OS_PROMPT = BOOT_OS_PROMPT|default(["console:/"]) %} -{% set FASTBOOT_COMMANDS = FASTBOOT_COMMANDS|default(["format:ext4 metadata", "oem select-display-panel hdmi", "reboot bootloader", "oem select-display-panel hdmi", "reboot bootloader", "oem select-display-panel hdmi", "reboot"]) %} -{% set DOCKER_PTABLE_FILE = DOCKER_PTABLE_FILE|default("gpt_both0.bin") %} -{% set PTABLE_URL = PTABLE_URL|default("https://images.validation.linaro.org/snapshots.linaro.org/96boards/qrb5165-rb5/linaro/rescue/27/rb5-bootloader-ufs-aosp-27/gpt_both0.bin") %} - -{% set partition_super = true %} -{% set partition_userdata = true %} -{% set partition_vendor_boot = true %} - -{% if TUXSUITE_BAKE_VENDOR_DOWNLOAD_URL is defined %} -{% set download_postprocess_required = true %} -{% set partition_boot_with_postprocess = false %} -{% set partition_super_with_postprocess = false %} -{% set partition_vendor_boot_with_postprocess = false %} -{% set partition_userdata_with_postprocess = false %} -{% endif%} diff --git a/lava_test_plans/projects/lkft-android/devices/variables/dragonboard-845c.yaml b/lava_test_plans/projects/lkft-android/devices/variables/dragonboard-845c.yaml deleted file mode 100644 index 0d8409bf..00000000 --- a/lava_test_plans/projects/lkft-android/devices/variables/dragonboard-845c.yaml +++ /dev/null @@ -1,6 +0,0 @@ -DEVICE_TYPE: dragonboard-845c -LAVA_JOB_PRIORITY: 25 -PROJECT: projects/lkft-android/ -TUXSUITE_BAKE_VENDOR_DOWNLOAD_URL: unknown -BUILD_REFERENCE_IMAGE_GZ_URL: unknown -LKFT_BUILD_CONFIG: unknown diff --git a/lava_test_plans/projects/lkft-android/devices/variables/hi6220-hikey-r2.yaml b/lava_test_plans/projects/lkft-android/devices/variables/hi6220-hikey-r2.yaml deleted file mode 100644 index ae30a3bb..00000000 --- a/lava_test_plans/projects/lkft-android/devices/variables/hi6220-hikey-r2.yaml +++ /dev/null @@ -1,8 +0,0 @@ -DEVICE_TYPE: hi6220-hikey-r2 -KERNEL_URL: unknown -DTB_URL: unknown -BOOT_URL: unknown -MODULES_URL: unknown -ROOTFS_URL: unknown -LAVA_JOB_PRIORITY: 25 -PROJECT: projects/lkft-android/ diff --git a/lava_test_plans/projects/lkft-android/devices/variables/qrb5165-rb5.yaml b/lava_test_plans/projects/lkft-android/devices/variables/qrb5165-rb5.yaml deleted file mode 100644 index fd708958..00000000 --- a/lava_test_plans/projects/lkft-android/devices/variables/qrb5165-rb5.yaml +++ /dev/null @@ -1,6 +0,0 @@ -DEVICE_TYPE: qrb5165-rb5 -LAVA_JOB_PRIORITY: 25 -PROJECT: projects/lkft-android/ -TUXSUITE_BAKE_VENDOR_DOWNLOAD_URL: unknown -BUILD_REFERENCE_IMAGE_GZ_URL: unknown -LKFT_BUILD_CONFIG: unknown diff --git a/lava_test_plans/projects/lkft-android/devices/x15 b/lava_test_plans/projects/lkft-android/devices/x15 deleted file mode 100644 index 119b3aa5..00000000 --- a/lava_test_plans/projects/lkft-android/devices/x15 +++ /dev/null @@ -1,59 +0,0 @@ -{% extends "devices/x15" %} - -{% set TAGS = TAGS|default(["hdmi-dongle"]) %} - -{# to avoid overriding by the one definied in testcases #} -{# like the one definied in testcases/boot.yaml is true by default #} -{% set auto_login = false %} -{% set boot_method = boot_method|default("fastboot") %} -{% set BOOT_OS_PROMPT = ["console:/"] %} - -{% set partition_boot_b = partition_boot_b|default(true) %} -{% set partition_vbmeta_a = partition_vbmeta_a|default(true) %} -{% set partition_vbmeta_b = partition_vbmeta_b|default(true) %} -{% set partition_super = partition_super|default(true) %} -{% set partition_userdata = partition_userdata|default(true) %} -{% set partition_recovery = partition_recovery|default(true) %} - -{# As there is only one boot.img generated for the x15 build #} -{# by the lkft-android project, so here set the A/B partition variables #} -{# with the same value as the boot partition, but they could be overriden #} -{# if different values are used #} -{# settings for the boot_a partition will be done via the boot partition #} -{% set BOOT_LABEL = "boot_a" %} -{% if BOOT_URL is defined %} -{% set BOOT_B_URL = BOOT_B_URL|default(BOOT_URL) %} -{% endif %} -{% if BOOT_URL_COMP is defined %} -{% set BOOT_B_URL_COMP = BOOT_B_URL_COMP|default(BOOT_URL_COMP) %} -{% endif %} - -{# the same as boot_a and boot_b here for the vbmeta_a and vbmeta_b #} -{% set VBMETA_A_URL = VBMETA_A_URL|default(VBMETA_URL) %} -{% set VBMETA_A_URL_COMP = VBMETA_A_URL_COMP|default(VBMETA_URL_COMP) %} -{% set VBMETA_B_URL = VBMETA_B_URL|default(VBMETA_URL) %} -{% set VBMETA_B_URL_COMP = VBMETA_B_URL_COMP|default(VBMETA_URL_COMP) %} - -{## set partition specific flags for postprocess ##} -{% if TUXSUITE_BAKE_VENDOR_DOWNLOAD_URL is defined %} -{% set partition_boot_with_postprocess = false %} -{% set partition_boot_b_with_postprocess = false %} -{% set partition_vbmeta_with_postprocess = false %} -{% set partition_vbmeta_a_with_postprocess = false %} -{% set partition_vbmeta_b_with_postprocess = false %} -{% set partition_super_with_postprocess = false %} -{% set partition_recovery_with_postprocess = false %} -{# Since the download action requires at least one file for downloading, #} -{# set variables for the userdata partition to workaround this problem #} -{% set USERDATA_URL = REFERENCE_BUILD_URL + "/userdata.img.xz" %} -{% set USERDATA_URL_COMP = "xz" %} -{% endif%} - -{# override the boot_commands block defined in "devices/x15" #} -{% block boot_commands %} -{% endblock boot_commands %} - -{# override the test_target block defined in "devices/x15" #} -{% block test_target %} -{% include "include/test_target.jinja2" %} -{% endblock test_target %} diff --git a/lava_test_plans/projects/lkft-android/fastboot.jinja2 b/lava_test_plans/projects/lkft-android/fastboot.jinja2 deleted file mode 100644 index d0f2204d..00000000 --- a/lava_test_plans/projects/lkft-android/fastboot.jinja2 +++ /dev/null @@ -1,134 +0,0 @@ -{% extends "include/fastboot.jinja2" %} - -{% set rootfs = rootfs|default(false) %} -{% set DEPLOY_TARGET = DEPLOY_TARGET|default("downloads") %} -{% set target_deploy_timeout = target_deploy_timeout |default(35) %} -{% set deploy_fastboot_timeout = deploy_fastboot_timeout|default(10) %} - -{% set LAVA_JOB_VISIBILITY = LAVA_JOB_VISIBILITY|default("group") %} -{% set LAVA_JOB_VISIBILITY_GROUPS = LAVA_JOB_VISIBILITY_GROUPS|default(["lkft"]) %} - -{# force all the lkft-android jobs to be run with the docker method #} -{% set USE_DOCKER_IMAGE_TEST_TARGET = true %} - -{% set DOCKER_PTABLE_FILE = DOCKER_PTABLE_FILE|default("ptable-linux-8g.img") %} -{% set DOCKER_BOOT_FILE = DOCKER_BOOT_FILE|default("boot.img") %} -{# use the same file name as for boot partition if no boot_a or boot_b images #} -{% set DOCKER_BOOT_A_FILE = DOCKER_BOOT_A_FILE|default(DOCKER_BOOT_FILE) %} -{% set DOCKER_BOOT_B_FILE = DOCKER_BOOT_B_FILE|default(DOCKER_BOOT_FILE) %} -{% set DOCKER_VBMETA_FILE = DOCKER_VBMETA_FILE|default("vbmeta.img") %} -{# use the same file name as for vbmeta partition if no vbmeta_a or vbmeta_b images #} -{% set DOCKER_VBMETA_A_FILE = DOCKER_VBMETA_A_FILE|default(DOCKER_VBMETA_FILE) %} -{% set DOCKER_VBMETA_B_FILE = DOCKER_VBMETA_B_FILE|default(DOCKER_VBMETA_FILE) %} -{% set DOCKER_SUPER_FILE = DOCKER_SUPER_FILE|default("super.img") %} -{% set DOCKER_SYSTEM_FILE = DOCKER_SYSTEM_FILE|default("system.img") %} -{% set DOCKER_VENDOR_FILE = DOCKER_VENDOR_FILE|default("vendor.img") %} -{% set DOCKER_VENDOR_BOOT_FILE = DOCKER_VENDOR_BOOT_FILE|default("vendor_boot.img") %} -{% set DOCKER_CACHE_FILE = DOCKER_CACHE_FILE|default("cache.img") %} -{% set DOCKER_METADATA_FILE = DOCKER_METADATA_FILE|default("metadata.img") %} -{% set DOCKER_RECOVERY_FILE = DOCKER_RECOVERY_FILE|default("recovery.img") %} -{% set DOCKER_USERDATA_FILE = DOCKER_USERDATA_FILE|default("userdata.img") %} - -{# set variable values used by the include/fastboot.jinja2 postprocess, #} -{# partition specific flags related to postprocess will be set #} -{# in the device file accordingly #} -{% set download_postprocess_required = download_postprocess_required|default(false) %} -{% if TUXSUITE_BAKE_VENDOR_DOWNLOAD_URL is defined %} -{% set download_postprocess_required = true %} -{% set DOCKER_IMAGE_POSTPROCESS = DOCKER_IMAGE_POSTPROCESS|default("linaro/lava-android-postprocess:bulleye-2023.09.14-01") %} -{% endif %} - -{% set DOCKER_IMAGE_TEST = DOCKER_IMAGE_TEST|default("linaro/lava-android-test:focal-2023.10.18-01") %} -{% set DOCKER_IMAGE_DEPLOY = DOCKER_IMAGE_DEPLOY|default("linaro/lava-android-test:focal-2023.10.18-01") %} -{% set DOCKER_IMAGE_BOOT = DOCKER_IMAGE_BOOT|default("linaro/lava-android-test:focal-2023.10.18-01") %} -{#################### job definitions ##########################} -{% block global_settings %} -{{ super() }} -{% block secrets %} -secrets: - SQUAD_ARCHIVE_SUBMIT_TOKEN: SQUAD_ARCHIVE_SUBMIT_TOKEN -{% endblock secrets %} -{% endblock global_settings %} - -{% block metadata %} -{% include PROJECT+"include/metadata.jinja2" %} -{% endblock metadata %} - -{% block deploy_target %} -{{ super() }} - -{% if DEPLOY_TARGET == "downloads" %} -{% if TUXSUITE_BAKE_VENDOR_DOWNLOAD_URL is defined %} - steps: -{% if BUILD_REFERENCE_IMAGE_GZ_URL is defined %} - - linaro-lkft-android.sh -g -k {{BUILD_REFERENCE_IMAGE_GZ_URL}} -v {{TUXSUITE_BAKE_VENDOR_DOWNLOAD_URL}} -c {{LKFT_BUILD_CONFIG}} -{% else %} - - linaro-lkft-android.sh -g -v {{TUXSUITE_BAKE_VENDOR_DOWNLOAD_URL}} -c {{LKFT_BUILD_CONFIG}} -{% endif %} -{% endif %} - -{% block deploy_fastboot %} -- deploy: - timeout: - minutes: {{ deploy_fastboot_timeout }} - to: fastboot - docker: - image: {{ DOCKER_IMAGE_DEPLOY }} - local: true - images: -{% if ptable == true %} - {{ PTABLE_LABEL }}: - url: downloads://{{ DOCKER_PTABLE_FILE }} -{% endif %} -{# only deploy to the boot partition when A/B partition not supported #} -{% if boot == true %} - {{ BOOT_LABEL }}: - url: downloads://{{ DOCKER_BOOT_FILE }} -{% endif %} -{% if partition_boot_b == true %} - boot_b: - url: downloads://{{ DOCKER_BOOT_B_FILE }} -{% endif %} -{% if partition_super == true %} - super: - url: downloads://{{ DOCKER_SUPER_FILE }} -{% endif %} -{% if partition_system == true %} - system: - url: downloads://{{ DOCKER_SYSTEM_FILE }} -{% endif %} -{% if partition_vendor == true %} - vendor: - url: downloads://{{ DOCKER_VENDOR_FILE }} -{% endif %} -{% if partition_vendor_boot == true %} - vendor_boot: - url: downloads://{{ DOCKER_VENDOR_BOOT_FILE }} -{% endif %} -{% if partition_cache == true %} - cache: - url: downloads://{{ DOCKER_CACHE_FILE }} -{% endif %} -{% if partition_vbmeta_a == true %} - vbmeta_a: - url: downloads://{{ DOCKER_VBMETA_FILE }} -{% endif %} -{% if partition_vbmeta_b == true %} - vbmeta_b: - url: downloads://{{ DOCKER_VBMETA_FILE }} -{% endif %} -{% if partition_recovery == true %} - recovery: - url: downloads://{{ DOCKER_RECOVERY_FILE }} -{% endif %} -{% if partition_userdata == true %} - userdata: - url: downloads://{{ DOCKER_USERDATA_FILE }} -{% endif %} -{% endblock deploy_fastboot %} -{% endif %} -{% endblock deploy_target %} - -{% block post_boot_command %} -{% include PROJECT+"include/lkft-common-actions.jinja2" %} -{% endblock post_boot_command %} diff --git a/lava_test_plans/projects/lkft-android/include/lkft-common-actions.jinja2 b/lava_test_plans/projects/lkft-android/include/lkft-common-actions.jinja2 deleted file mode 100644 index 9db2e963..00000000 --- a/lava_test_plans/projects/lkft-android/include/lkft-common-actions.jinja2 +++ /dev/null @@ -1,39 +0,0 @@ -{% set post_boot_interactive_timeout = post_boot_interactive_timeout|default(5) %} -{% set post_boot_adb_commands_timeout = post_boot_adb_commands_timeout|default(5) %} - -{# enable_tests is set to false in testcases/boot.yaml #} -{# but here are common actions which will be used for that boot job as well, #} -{# so need to override that and set to true explictly #} -{% with enable_tests=true, test_timeout=post_boot_interactive_timeout, test_target_interactive=true, USE_DOCKER_IMAGE_TEST_TARGET=false %} -{% include "include/test_target.jinja2" %} -{% endwith %} - - name: sleep-to-wait-adb-available -{% filter indent(width=2, first=True)%} -{% include "include/boot_target/boot_os_prompt.jinja2" %} -{% endfilter %} - script: - - command: echo =========================== - - command: while ! getprop sys.boot_completed|grep 1; do echo sleep 10s for sys.boot_completed; sleep 10; done - - command: echo =========================== - - command: while ! getprop init.svc.adbd|grep running; do echo sleep 10s for init.svc.adbd; sleep 10; done - - command: echo =========================== - - command: getprop | grep adb - - command: echo =========================== - -{% with enable_tests=true, test_timeout=post_boot_adb_commands_timeout %} -{% include "include/test_target.jinja2" %} -{% endwith %} - - from: inline - path: boot.yaml - name: boot - repository: - metadata: - format: Lava-Test Test Definition 1.0 - name: boot - description: "boot" - run: - steps: - - lava-test-case "android-boot-wait-for-device" --shell adb wait-for-device - - lava-test-case "android-boot-boot-completed" --shell "while ! adb shell getprop sys.boot_completed|grep 1; do sleep 2; done" - - lava-test-case "android-boot-set-power-stayon" --shell adb shell su 0 svc power stayon true - - lava-test-case "android-boot-screencap" --shell adb shell screencap -p /data/local/tmp/screencap.png diff --git a/lava_test_plans/projects/lkft-android/include/metadata.jinja2 b/lava_test_plans/projects/lkft-android/include/metadata.jinja2 deleted file mode 100644 index 45b78fe6..00000000 --- a/lava_test_plans/projects/lkft-android/include/metadata.jinja2 +++ /dev/null @@ -1,20 +0,0 @@ - android.build: "{{ BUILD_NUMBER | default('unknown')}}" - android.name: "{{ JOB_NAME | default('unknown')}}" - android.url: "{{ REFERENCE_BUILD_URL | default('unknown')}}" - android.version: "{{ ANDROID_VERSION | default('unknown')}}" -{% if ANDROID_VENDOR_FINGERPRINT is defined %} - android.build.vendor.fingerprint: "{{ ANDROID_VENDOR_FINGERPRINT }}" -{% endif %} -{% if ANDROID_GSI_FINGERPRINT is defined %} - android.build.gsi.url: "{{ ANDROID_GSI_URL }}" - android.build.gsi.fingerprint: "{{ ANDROID_GSI_FINGERPRINT }}" -{% endif %} -{% if TUXSUITE_DOWNLOAD_URL is defined %} - tuxsuite.download.url: "{{ TUXSUITE_DOWNLOAD_URL }}" -{% endif %} - lkft.build.config: "{{ LKFT_BUILD_CONFIG | default('unknown')}}" - git branch: "{{ KERNEL_BRANCH | default('unknown')}}" - git repo: "{{ KERNEL_REPO | default('unknown')}}" - git commit: "{{ KERNEL_COMMIT | default('unknown')}}" - git describe: "{{ KERNEL_DESCRIBE | default('unknown')}}" - build-url: "{{ BUILD_URL | default('unknown')}}" diff --git a/lava_test_plans/projects/lkft-android/variables.ini b/lava_test_plans/projects/lkft-android/variables.ini deleted file mode 100644 index 5e64909f..00000000 --- a/lava_test_plans/projects/lkft-android/variables.ini +++ /dev/null @@ -1,52 +0,0 @@ -REFERENCE_BUILD_URL="reference-build-url" -ANDROID_VERSION="android-version" -KERNEL_BRANCH="kernel-branch" -KERNEL_REPO="kernel-repo-url" -# -BUILD_URL="build-url" -BUILD_NUMBER="build-number" -JOB_NAME="job-name" -# -LKFT_BUILD_CONFIG="lkft-android-build-config" -KERNEL_COMMIT="kernel-commit" -KERNEL_DESCRIBE="kernel-describe" -# -LAVA_JOB_PRIORITY="99" -# -ANDROID_VENDOR_FINGERPRINT="android-vendor-fingerprint" -# -BOOT_URL="boot-image-url" -BOOT_URL_COMP="xz" -SYSTEM_URL="system-image-url" -SYSTEM_URL_COMP="xz" -VENDOR_URL="vendor-image-url" -VENDOR_URL_COMP="xz" -SUPER_URL="super-image-url" -SUPER_URL_COMP="xz" -VBMETA_URL="vbmeta-image-url" -VBMETA_URL_COMP="xz" -USERDATA_URL="userdata-image-url" -USERDATA_URL_COMP="xz" -RECOVERY_URL="recovery-image-url" -RECOVERY_URL_COMP="xz" -VENDOR_BOOT_URL="vendor-image-url" -VENDOR_BOOT_URL_COMP="xz" -PROJECT="projects/lkft-android/" -PROJECT_NAME="lkft" -# -DEPLOY_TARGET="fastboot" -OS_INFO="android" -DEPLOY_OS="android" - -# -DOCKER_IMAGE_TEST="docker-hub-url" - -# -SQUAD_URL="squad-url" -SQUAD_ARCHIVE_SUBMIT_TOKEN="squad-archive-submit-token" - -# -TEST_CTS_URL="test-cts-url" -TEST_VTS_URL="test-vts-url" -TEST_CTS_VERSION="test-cts-version" -TEST_VTS_VERSION="test-vts-version" diff --git a/lava_test_plans/projects/lkft/devices/bcm2711-rpi-4-b b/lava_test_plans/projects/lkft/devices/bcm2711-rpi-4-b deleted file mode 100644 index e9cb3bd0..00000000 --- a/lava_test_plans/projects/lkft/devices/bcm2711-rpi-4-b +++ /dev/null @@ -1,21 +0,0 @@ -{% extends "devices/bcm2711-rpi-4-b" %} - -{% set DEPLOY_OS = DEPLOY_OS|default("oe") %} -{% set KERNEL_URL_COMP = KERNEL_URL_COMP|default("gz") %} -{% set MODULES_URL_COMP = MODULES_URL_COMP|default("xz") %} -{% set OVERLAY_KSELFTEST_URL_FORMAT = OVERLAY_KSELFTEST_URL_FORMAT|default("tar") %} -{% set OVERLAY_KSELFTEST_URL_COMP = OVERLAY_KSELFTEST_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") %} -{% set OVERLAY_URL_FORMAT = OVERLAY_URL_FORMAT|default("tar") %} -{% set OVERLAY_URL_COMP = OVERLAY_URL_COMP|default("xz") %} -{% set ROOTFS_URL_FORMAT = ROOTFS_URL_FORMAT|default("tar") %} -{% set ROOTFS_URL_COMP = ROOTFS_URL_COMP|default("xz") %} - -{% set EXTRA_KERNEL_ARGS = ' earlycon ' + EXTRA_KERNEL_ARGS|default("") %} -{% block context %} - {{ super() }} - booti_dtb_addr: "0x86000000" - extra_nfsroot_args: ',vers=3' - console_device: 'ttyS0' -{% endblock context %} diff --git a/lava_test_plans/projects/lkft/devices/dragonboard-410c b/lava_test_plans/projects/lkft/devices/dragonboard-410c deleted file mode 100644 index 4f1b10e5..00000000 --- a/lava_test_plans/projects/lkft/devices/dragonboard-410c +++ /dev/null @@ -1,15 +0,0 @@ -{% if DEPLOY_OS == "debian" %} -{% set ROOTFS_URL_COMP = ROOTFS_URL_COMP|default("xz") %} -{% endif %} - -{% extends "devices/dragonboard-410c" %} - -{% set BOOT_URL = BOOT_URL|default("http://images.validation.linaro.org/releases.linaro.org/96boards/dragonboard410c/linaro/debian/18.01/boot-linaro-buster-dragonboard-410c-359.img.gz") %} -{% set MODULES_URL_COMP = MODULES_URL_COMP|default("xz") %} -{% set OVERLAY_KSELFTEST_URL_FORMAT = OVERLAY_KSELFTEST_URL_FORMAT|default("tar") %} -{% set OVERLAY_KSELFTEST_URL_COMP = OVERLAY_KSELFTEST_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") %} -{% set OVERLAY_URL_FORMAT = OVERLAY_URL_FORMAT|default("tar") %} -{% set OVERLAY_URL_COMP = OVERLAY_URL_COMP|default("xz") %} -{% set ROOTFS_URL_FORMAT = ROOTFS_URL_FORMAT|default("ext4") %} diff --git a/lava_test_plans/projects/lkft/devices/dragonboard-845c b/lava_test_plans/projects/lkft/devices/dragonboard-845c deleted file mode 100644 index 8551a6a6..00000000 --- a/lava_test_plans/projects/lkft/devices/dragonboard-845c +++ /dev/null @@ -1,23 +0,0 @@ -{% if DEPLOY_OS == "debian" %} -{% set ROOTFS_URL_COMP = ROOTFS_URL_COMP|default("xz") %} -{% endif %} - -{% extends "devices/dragonboard-845c" %} - -{% set test_target_redirect_to_kmsg = false %} - -{% set ramdisk = ramdisk|default(true) %} -{% set BOOT_LABEL = "kernel" %} -{% set BOOT_LABEL_OVERRIDE = true %} -{% set DOCKER_PTABLE_FILE = DOCKER_PTABLE_FILE|default("gpt_both0.bin") %} -{% set PTABLE_URL = PTABLE_URL|default("https://images.validation.linaro.org/snapshots.linaro.org/96boards/dragonboard845c/linaro/rescue/28/dragonboard-845c-bootloader-ufs-linux-28/gpt_both0.bin") %} -{% set MODULES_URL_COMP = MODULES_URL_COMP|default("xz") %} -{% set OVERLAY_KSELFTEST_URL_FORMAT = OVERLAY_KSELFTEST_URL_FORMAT|default("tar") %} -{% set OVERLAY_KSELFTEST_URL_COMP = OVERLAY_KSELFTEST_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") %} -{% set OVERLAY_URL_FORMAT = OVERLAY_URL_FORMAT|default("tar") %} -{% set OVERLAY_URL_COMP = OVERLAY_URL_COMP|default("xz") %} -{% set RAMDISK_URL = RAMDISK_URL|default("https://snapshots.linaro.org/member-builds/qcomlt/boards/qcom-armv8a/openembedded/master/56008/rpb/initramfs-rootfs-image-qcom-armv8a.rootfs-20240118001247-92260.cpio.gz") %} -{% set ROOTFS_URL_FORMAT = ROOTFS_URL_FORMAT|default("ext4") %} -{% set TAGS = TAGS|default(["lts"]) %} diff --git a/lava_test_plans/projects/lkft/devices/e850-96 b/lava_test_plans/projects/lkft/devices/e850-96 deleted file mode 100644 index d3d7319c..00000000 --- a/lava_test_plans/projects/lkft/devices/e850-96 +++ /dev/null @@ -1,15 +0,0 @@ -{% if DEPLOY_OS == "debian" %} -{% set ROOTFS_URL_COMP = ROOTFS_URL_COMP|default("xz") %} -{% endif %} - -{% extends "devices/e850-96" %} - -{% set BOOT_URL = BOOT_URL|default("http://images.validation.linaro.org/releases.linaro.org/96boards/dragonboard410c/linaro/debian/18.01/boot-linaro-buster-dragonboard-410c-359.img.gz") %} -{% set MODULES_URL_COMP = MODULES_URL_COMP|default("xz") %} -{% set OVERLAY_KSELFTEST_URL_FORMAT = OVERLAY_KSELFTEST_URL_FORMAT|default("tar") %} -{% set OVERLAY_KSELFTEST_URL_COMP = OVERLAY_KSELFTEST_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") %} -{% set OVERLAY_URL_FORMAT = OVERLAY_URL_FORMAT|default("tar") %} -{% set OVERLAY_URL_COMP = OVERLAY_URL_COMP|default("xz") %} -{% set ROOTFS_URL_FORMAT = ROOTFS_URL_FORMAT|default("ext4") %} diff --git a/lava_test_plans/projects/lkft/devices/hi6220-hikey-r2 b/lava_test_plans/projects/lkft/devices/hi6220-hikey-r2 deleted file mode 100644 index 34ed3fbd..00000000 --- a/lava_test_plans/projects/lkft/devices/hi6220-hikey-r2 +++ /dev/null @@ -1,10 +0,0 @@ -{% extends "devices/hi6220-hikey-r2" %} - -{% set MODULES_URL_COMP = MODULES_URL_COMP|default("xz") %} -{% set OVERLAY_KSELFTEST_URL_FORMAT = OVERLAY_KSELFTEST_URL_FORMAT|default("tar") %} -{% set OVERLAY_KSELFTEST_URL_COMP = OVERLAY_KSELFTEST_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") %} -{% set OVERLAY_URL_FORMAT = OVERLAY_URL_FORMAT|default("tar") %} -{% set OVERLAY_URL_COMP = OVERLAY_URL_COMP|default("xz") %} -{% set ROOTFS_URL_FORMAT = ROOTFS_URL_FORMAT|default("ext4") %} diff --git a/lava_test_plans/projects/lkft/devices/i386 b/lava_test_plans/projects/lkft/devices/i386 deleted file mode 100644 index 2234cae2..00000000 --- a/lava_test_plans/projects/lkft/devices/i386 +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "devices/i386" %} - -{% set BOOT_OS_PROMPT = BOOT_OS_PROMPT|default("root@intel-core2-32:") %} -{% set MODULES_URL_COMP = MODULES_URL_COMP|default("xz") %} -{% set OVERLAY_CPUPOWER_URL_FORMAT = OVERLAY_CPUPOWER_URL_FORMAT|default("tar") %} -{% set OVERLAY_CPUPOWER_URL_COMP = OVERLAY_CPUPOWER_URL_COMP|default("xz") %} -{% set OVERLAY_KSELFTEST_URL_FORMAT = OVERLAY_KSELFTEST_URL_FORMAT|default("tar") %} -{% set OVERLAY_KSELFTEST_URL_COMP = OVERLAY_KSELFTEST_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") %} -{% set OVERLAY_URL_FORMAT = OVERLAY_URL_FORMAT|default("tar") %} -{% set OVERLAY_URL_COMP = OVERLAY_URL_COMP|default("xz") %} -{% set ROOTFS_URL_FORMAT = ROOTFS_URL_FORMAT|default("tar") %} diff --git a/lava_test_plans/projects/lkft/devices/juno-r2 b/lava_test_plans/projects/lkft/devices/juno-r2 deleted file mode 100644 index adc0c411..00000000 --- a/lava_test_plans/projects/lkft/devices/juno-r2 +++ /dev/null @@ -1,19 +0,0 @@ -{% extends "devices/juno-r2" %} - -{% set KERNEL_URL_COMP = KERNEL_URL_COMP|default("gz") %} -{% set MODULES_URL_COMP = MODULES_URL_COMP|default("xz") %} -{% set OVERLAY_KSELFTEST_URL_FORMAT = OVERLAY_KSELFTEST_URL_FORMAT|default("tar") %} -{% set OVERLAY_KSELFTEST_URL_COMP = OVERLAY_KSELFTEST_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") %} -{% set OVERLAY_URL_FORMAT = OVERLAY_URL_FORMAT|default("tar") %} -{% set OVERLAY_URL_COMP = OVERLAY_URL_COMP|default("xz") %} -{% set ROOTFS_URL_FORMAT = ROOTFS_URL_FORMAT|default("tar") %} - -{% set EXTRA_KERNEL_ARGS = 'default_hugepagesz=2M hugepages=256 earlycon ' + EXTRA_KERNEL_ARGS|default("") %} - -{% block context %} - {{ super() }} - booti_dtb_addr: "0x88000000" - extra_nfsroot_args: ',wsize=65536' -{% endblock context %} diff --git a/lava_test_plans/projects/lkft/devices/nxp-ls2088 b/lava_test_plans/projects/lkft/devices/nxp-ls2088 deleted file mode 100644 index b5805eb9..00000000 --- a/lava_test_plans/projects/lkft/devices/nxp-ls2088 +++ /dev/null @@ -1,10 +0,0 @@ -{% extends "devices/nxp-ls2088" %} - -{% set DEPLOY_OS = DEPLOY_OS|default("oe") %} -{% set OVERLAY_KSELFTEST_URL_FORMAT = OVERLAY_KSELFTEST_URL_FORMAT|default("tar") %} -{% set OVERLAY_KSELFTEST_URL_COMP = OVERLAY_KSELFTEST_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") %} -{% set OVERLAY_URL_FORMAT = OVERLAY_URL_FORMAT|default("tar") %} -{% set OVERLAY_URL_COMP = OVERLAY_URL_COMP|default("xz") %} -{% set ROOTFS_URL_COMP = ROOTFS_URL_COMP|default("xz") %} diff --git a/lava_test_plans/projects/lkft/devices/qemu_arm b/lava_test_plans/projects/lkft/devices/qemu_arm deleted file mode 120000 index 8cb17b8f..00000000 --- a/lava_test_plans/projects/lkft/devices/qemu_arm +++ /dev/null @@ -1 +0,0 @@ -qemu_arm64 \ No newline at end of file diff --git a/lava_test_plans/projects/lkft/devices/qemu_arm64 b/lava_test_plans/projects/lkft/devices/qemu_arm64 deleted file mode 100644 index 4ae39c23..00000000 --- a/lava_test_plans/projects/lkft/devices/qemu_arm64 +++ /dev/null @@ -1,23 +0,0 @@ -{% if DEPLOY_OS == "debian" %} -{% set ROOTFS_URL_COMP = ROOTFS_URL_COMP|default("xz") %} -{% endif %} - -{% extends "devices/qemu_arm64" %} - -{% set ROOTFS_URL_FORMAT = ROOTFS_URL_FORMAT|default("ext4") %} -{% set OVERLAY_KSELFTEST_URL_FORMAT = OVERLAY_KSELFTEST_URL_FORMAT|default("tar") %} -{% set OVERLAY_KSELFTEST_URL_COMP = OVERLAY_KSELFTEST_URL_COMP|default("xz") %} -{% set OVERLAY_MODULES_URL_FORMAT = OVERLAY_MODULES_URL_FORMAT|default("tar") %} -{% 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") %} -{% set OVERLAY_URL_FORMAT = OVERLAY_URL_FORMAT|default("tar") %} -{% set OVERLAY_URL_COMP = OVERLAY_URL_COMP|default("xz") %} -{% set OVERLAY_MMTESTS_URL_COMP = OVERLAY_MMTESTS_URL_COMP|default("xz") %} -{% set OVERLAY_MMTESTS_URL_FORMAT = OVERLAY_MMTESTS_URL_FORMAT|default("tar") %} - -{% 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") %} -{% endif %} diff --git a/lava_test_plans/projects/lkft/devices/qemu_i386 b/lava_test_plans/projects/lkft/devices/qemu_i386 deleted file mode 100644 index 89994bbf..00000000 --- a/lava_test_plans/projects/lkft/devices/qemu_i386 +++ /dev/null @@ -1,17 +0,0 @@ -{% if DEPLOY_OS == "debian" %} -{% set ROOTFS_URL_COMP = ROOTFS_URL_COMP|default("xz") %} -{% endif %} - -{% extends "devices/qemu_i386" %} - -{% set ROOTFS_URL_FORMAT = ROOTFS_URL_FORMAT|default("ext4") %} -{% set OVERLAY_CPUPOWER_URL_FORMAT = OVERLAY_CPUPOWER_URL_FORMAT|default("tar") %} -{% set OVERLAY_CPUPOWER_URL_COMP = OVERLAY_CPUPOWER_URL_COMP|default("xz") %} -{% set OVERLAY_KSELFTEST_URL_FORMAT = OVERLAY_KSELFTEST_URL_FORMAT|default("tar") %} -{% set OVERLAY_KSELFTEST_URL_COMP = OVERLAY_KSELFTEST_URL_COMP|default("xz") %} -{% set OVERLAY_MODULES_URL_FORMAT = OVERLAY_MODULES_URL_FORMAT|default("tar") %} -{% 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") %} -{% set OVERLAY_URL_FORMAT = OVERLAY_URL_FORMAT|default("tar") %} -{% set OVERLAY_URL_COMP = OVERLAY_URL_COMP|default("xz") %} diff --git a/lava_test_plans/projects/lkft/devices/qemu_x86_64 b/lava_test_plans/projects/lkft/devices/qemu_x86_64 deleted file mode 100644 index 86545b21..00000000 --- a/lava_test_plans/projects/lkft/devices/qemu_x86_64 +++ /dev/null @@ -1,43 +0,0 @@ -{% if DEPLOY_OS == "debian" %} -{% set ROOTFS_URL_COMP = ROOTFS_URL_COMP|default("xz") %} -{% endif %} - -{% extends "devices/qemu_x86_64" %} - -{% set ROOTFS_URL_FORMAT = ROOTFS_URL_FORMAT|default("ext4") %} -{% set OVERLAY_CPUPOWER_URL_FORMAT = OVERLAY_CPUPOWER_URL_FORMAT|default("tar") %} -{% set OVERLAY_CPUPOWER_URL_COMP = OVERLAY_CPUPOWER_URL_COMP|default("xz") %} -{% set OVERLAY_KSELFTEST_URL_FORMAT = OVERLAY_KSELFTEST_URL_FORMAT|default("tar") %} -{% set OVERLAY_KSELFTEST_URL_COMP = OVERLAY_KSELFTEST_URL_COMP|default("xz") %} -{% set OVERLAY_MODULES_URL_FORMAT = OVERLAY_MODULES_URL_FORMAT|default("tar") %} -{% 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") %} -{% set OVERLAY_URL_FORMAT = OVERLAY_URL_FORMAT|default("tar") %} -{% set OVERLAY_URL_COMP = OVERLAY_URL_COMP|default("xz") %} -{% set OVERLAY_MMTESTS_URL_COMP = OVERLAY_MMTESTS_URL_COMP|default("xz") %} -{% set OVERLAY_MMTESTS_URL_FORMAT = OVERLAY_MMTESTS_URL_FORMAT|default("tar") %} - -{% block test_target %} -{% if enable_tests is defined and enable_tests %} -{% if DEPLOY_OS is defined and DEPLOY_OS == "oe" %} -- test: - timeout: - minutes: 5 - definitions: - - from: inline - repository: - metadata: - format: Lava-Test Test Definition 1.0 - name: prep-tests - description: "Device preparation" - run: - steps: - # Tests expecting /lib64 - - ln -sf /lib /lib64 - name: prep-inline - path: inline/prep.yaml -{% endif %} - {{ super() }} -{% endif %} -{% endblock test_target %} diff --git a/lava_test_plans/projects/lkft/devices/qrb5165-rb5 b/lava_test_plans/projects/lkft/devices/qrb5165-rb5 deleted file mode 100644 index f56cdf0f..00000000 --- a/lava_test_plans/projects/lkft/devices/qrb5165-rb5 +++ /dev/null @@ -1,23 +0,0 @@ -{% if DEPLOY_OS == "debian" %} -{% set ROOTFS_URL_COMP = ROOTFS_URL_COMP|default("xz") %} -{% endif %} - -{% extends "devices/qrb5165-rb5" %} - -{% set pre_os_command = false %} -{% set post_boot_command = true %} -{% set ramdisk = ramdisk|default(true) %} -{% set rootfs_label = 'rootfs' %} -{% set BOOT_LABEL = "kernel" %} -{% set BOOT_LABEL_OVERRIDE = true %} -{% set DOCKER_PTABLE_FILE = DOCKER_PTABLE_FILE|default("gpt_both0.bin") %} -{% set PTABLE_URL = PTABLE_URL|default("https://images.validation.linaro.org/snapshots.linaro.org/96boards/qrb5165-rb5/linaro/rescue/27/rb5-bootloader-ufs-linux-27/gpt_both0.bin") %} -{% set MODULES_URL_COMP = MODULES_URL_COMP|default("xz") %} -{% set OVERLAY_KSELFTEST_URL_FORMAT = OVERLAY_KSELFTEST_URL_FORMAT|default("tar") %} -{% set OVERLAY_KSELFTEST_URL_COMP = OVERLAY_KSELFTEST_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") %} -{% set OVERLAY_URL_FORMAT = OVERLAY_URL_FORMAT|default("tar") %} -{% set OVERLAY_URL_COMP = OVERLAY_URL_COMP|default("xz") %} -{% set RAMDISK_URL = RAMDISK_URL|default("https://snapshots.linaro.org/member-builds/qcomlt/boards/qcom-armv8a/openembedded/master/56008/rpb/initramfs-rootfs-image-qcom-armv8a.rootfs-20240118001247-92260.cpio.gz") %} -{% set ROOTFS_URL_FORMAT = ROOTFS_URL_FORMAT|default("ext4") %} diff --git a/lava_test_plans/projects/lkft/devices/rk3399-rock-pi-4b b/lava_test_plans/projects/lkft/devices/rk3399-rock-pi-4b deleted file mode 100644 index 9abcc6b7..00000000 --- a/lava_test_plans/projects/lkft/devices/rk3399-rock-pi-4b +++ /dev/null @@ -1,20 +0,0 @@ -{% extends "devices/rk3399-rock-pi-4b" %} - -{% set DEPLOY_OS = DEPLOY_OS|default("oe") %} -{% set KERNEL_URL_COMP = KERNEL_URL_COMP|default("gz") %} -{% set MODULES_URL_COMP = MODULES_URL_COMP|default("xz") %} -{% set OVERLAY_KSELFTEST_URL_FORMAT = OVERLAY_KSELFTEST_URL_FORMAT|default("tar") %} -{% set OVERLAY_KSELFTEST_URL_COMP = OVERLAY_KSELFTEST_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") %} -{% set OVERLAY_URL_FORMAT = OVERLAY_URL_FORMAT|default("tar") %} -{% set OVERLAY_URL_COMP = OVERLAY_URL_COMP|default("xz") %} -{% set ROOTFS_URL_FORMAT = ROOTFS_URL_FORMAT|default("tar") %} -{% set ROOTFS_URL_COMP = ROOTFS_URL_COMP|default("xz") %} - -{% set EXTRA_KERNEL_ARGS = ' earlycon ' + EXTRA_KERNEL_ARGS|default("") %} -{% block context %} - {{ super() }} - booti_dtb_addr: "0x86000000" - extra_nfsroot_args: ',vers=3' -{% endblock context %} diff --git a/lava_test_plans/projects/lkft/devices/thunderx b/lava_test_plans/projects/lkft/devices/thunderx deleted file mode 100644 index 2e9ab83c..00000000 --- a/lava_test_plans/projects/lkft/devices/thunderx +++ /dev/null @@ -1,8 +0,0 @@ -{% extends "devices/thunderx" %} -{% set BOOT_OS_PROMPT = BOOT_OS_PROMPT|default("root@juno:") %} -{% set OVERLAY_KSELFTEST_URL_FORMAT = OVERLAY_KSELFTEST_URL_FORMAT|default("tar") %} -{% set OVERLAY_KSELFTEST_URL_COMP = OVERLAY_KSELFTEST_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") %} -{% set OVERLAY_URL_FORMAT = OVERLAY_URL_FORMAT|default("tar") %} -{% set OVERLAY_URL_COMP = OVERLAY_URL_COMP|default("xz") %} diff --git a/lava_test_plans/projects/lkft/devices/variables/bcm2711-rpi-4-b.yaml b/lava_test_plans/projects/lkft/devices/variables/bcm2711-rpi-4-b.yaml deleted file mode 100644 index 08a9a71a..00000000 --- a/lava_test_plans/projects/lkft/devices/variables/bcm2711-rpi-4-b.yaml +++ /dev/null @@ -1,7 +0,0 @@ -DEVICE_TYPE: bcm2711-rpi-4-b -KERNEL_URL: unknown -DTB_URL: unknown -MODULES_URL: unknown -ROOTFS_URL: unknown -LAVA_JOB_PRIORITY: 25 -PROJECT: projects/lkft/ diff --git a/lava_test_plans/projects/lkft/devices/variables/dragonboard-410c.yaml b/lava_test_plans/projects/lkft/devices/variables/dragonboard-410c.yaml deleted file mode 100644 index 6471018f..00000000 --- a/lava_test_plans/projects/lkft/devices/variables/dragonboard-410c.yaml +++ /dev/null @@ -1,8 +0,0 @@ -DEVICE_TYPE: dragonboard-410c -KERNEL_URL: unknown -DTB_URL: unknown -BOOT_URL: unknown -MODULES_URL: unknown -ROOTFS_URL: unknown -LAVA_JOB_PRIORITY: 25 -PROJECT: projects/lkft/ diff --git a/lava_test_plans/projects/lkft/devices/variables/dragonboard-845c.yaml b/lava_test_plans/projects/lkft/devices/variables/dragonboard-845c.yaml deleted file mode 100644 index 6471018f..00000000 --- a/lava_test_plans/projects/lkft/devices/variables/dragonboard-845c.yaml +++ /dev/null @@ -1,8 +0,0 @@ -DEVICE_TYPE: dragonboard-410c -KERNEL_URL: unknown -DTB_URL: unknown -BOOT_URL: unknown -MODULES_URL: unknown -ROOTFS_URL: unknown -LAVA_JOB_PRIORITY: 25 -PROJECT: projects/lkft/ diff --git a/lava_test_plans/projects/lkft/devices/variables/e850-96.yaml b/lava_test_plans/projects/lkft/devices/variables/e850-96.yaml deleted file mode 100644 index 66ec1c6a..00000000 --- a/lava_test_plans/projects/lkft/devices/variables/e850-96.yaml +++ /dev/null @@ -1,7 +0,0 @@ -DEVICE_TYPE: e850-96 -KERNEL_URL: unknown -DTB_URL: unknown -MODULES_URL: unknown -ROOTFS_URL: unknown -LAVA_JOB_PRIORITY: 25 -PROJECT: projects/lkft/ diff --git a/lava_test_plans/projects/lkft/devices/variables/hi6220-hikey-r2.yaml b/lava_test_plans/projects/lkft/devices/variables/hi6220-hikey-r2.yaml deleted file mode 100644 index fe7956a3..00000000 --- a/lava_test_plans/projects/lkft/devices/variables/hi6220-hikey-r2.yaml +++ /dev/null @@ -1,8 +0,0 @@ -DEVICE_TYPE: hi6220-hikey-r2 -KERNEL_URL: unknown -DTB_URL: unknown -BOOT_URL: unknown -MODULES_URL: unknown -ROOTFS_URL: unknown -LAVA_JOB_PRIORITY: 25 -PROJECT: projects/lkft/ diff --git a/lava_test_plans/projects/lkft/devices/variables/i386.yaml b/lava_test_plans/projects/lkft/devices/variables/i386.yaml deleted file mode 100644 index d1752c13..00000000 --- a/lava_test_plans/projects/lkft/devices/variables/i386.yaml +++ /dev/null @@ -1,7 +0,0 @@ -DEVICE_TYPE: i386 -KERNEL_URL: unknown -BOOT_URL: unknown -MODULES_URL: unknown -ROOTFS_URL: unknown -LAVA_JOB_PRIORITY: 25 -PROJECT: projects/lkft/ diff --git a/lava_test_plans/projects/lkft/devices/variables/juno-r2.yaml b/lava_test_plans/projects/lkft/devices/variables/juno-r2.yaml deleted file mode 100644 index 5d8d683f..00000000 --- a/lava_test_plans/projects/lkft/devices/variables/juno-r2.yaml +++ /dev/null @@ -1,7 +0,0 @@ -DEVICE_TYPE: juno-r2 -KERNEL_URL: unknown -DTB_URL: unknown -MODULES_URL: unknown -ROOTFS_URL: unknown -LAVA_JOB_PRIORITY: 25 -PROJECT: projects/lkft/ diff --git a/lava_test_plans/projects/lkft/devices/variables/qrb5165-rb5.yaml b/lava_test_plans/projects/lkft/devices/variables/qrb5165-rb5.yaml deleted file mode 100644 index ca6a5000..00000000 --- a/lava_test_plans/projects/lkft/devices/variables/qrb5165-rb5.yaml +++ /dev/null @@ -1,8 +0,0 @@ -DEVICE_TYPE: qrb5165-rb5 -KERNEL_URL: unknown -DTB_URL: unknown -BOOT_URL: unknown -MODULES_URL: unknown -ROOTFS_URL: unknown -LAVA_JOB_PRIORITY: 25 -PROJECT: projects/lkft/ diff --git a/lava_test_plans/projects/lkft/devices/variables/rk3399-rock-pi-4b.yaml b/lava_test_plans/projects/lkft/devices/variables/rk3399-rock-pi-4b.yaml deleted file mode 100644 index d3bc62e6..00000000 --- a/lava_test_plans/projects/lkft/devices/variables/rk3399-rock-pi-4b.yaml +++ /dev/null @@ -1,7 +0,0 @@ -DEVICE_TYPE: rk3399-rock-pi-4b -KERNEL_URL: unknown -DTB_URL: unknown -MODULES_URL: unknown -ROOTFS_URL: unknown -LAVA_JOB_PRIORITY: 25 -PROJECT: projects/lkft/ diff --git a/lava_test_plans/projects/lkft/devices/variables/x15.yaml b/lava_test_plans/projects/lkft/devices/variables/x15.yaml deleted file mode 100644 index 9cd4f48f..00000000 --- a/lava_test_plans/projects/lkft/devices/variables/x15.yaml +++ /dev/null @@ -1,8 +0,0 @@ -DEVICE_TYPE: x15 -KERNEL_URL: unknown -DTB_URL: unknown -BOOT_URL: unknown -MODULES_URL: unknown -ROOTFS_URL: unknown -LAVA_JOB_PRIORITY: 25 -PROJECT: projects/lkft/ diff --git a/lava_test_plans/projects/lkft/devices/variables/x86.yaml b/lava_test_plans/projects/lkft/devices/variables/x86.yaml deleted file mode 100644 index 05c80044..00000000 --- a/lava_test_plans/projects/lkft/devices/variables/x86.yaml +++ /dev/null @@ -1,6 +0,0 @@ -DEVICE_TYPE: x86 -KERNEL_URL: unknown -MODULES_URL: unknown -ROOTFS_URL: unknown -LAVA_JOB_PRIORITY: 25 -PROJECT: projects/lkft/ diff --git a/lava_test_plans/projects/lkft/devices/x15 b/lava_test_plans/projects/lkft/devices/x15 deleted file mode 100644 index 9dd66433..00000000 --- a/lava_test_plans/projects/lkft/devices/x15 +++ /dev/null @@ -1,15 +0,0 @@ -{% if DEPLOY_OS == "debian" %} -{% set ROOTFS_URL_COMP = ROOTFS_URL_COMP|default("xz") %} -{% endif %} - -{% extends "devices/x15" %} - -{% set BOOT_LABEL = BOOT_LABEL|default("kernel") %} -{% set MODULES_URL_COMP = MODULES_URL_COMP|default("xz") %} -{% set OVERLAY_KSELFTEST_URL_FORMAT = OVERLAY_KSELFTEST_URL_FORMAT|default("tar") %} -{% set OVERLAY_KSELFTEST_URL_COMP = OVERLAY_KSELFTEST_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") %} -{% set OVERLAY_URL_FORMAT = OVERLAY_URL_FORMAT|default("tar") %} -{% set OVERLAY_URL_COMP = OVERLAY_URL_COMP|default("xz") %} -{% set ROOTFS_URL_FORMAT = ROOTFS_URL_FORMAT|default("ext4") %} diff --git a/lava_test_plans/projects/lkft/devices/x86 b/lava_test_plans/projects/lkft/devices/x86 deleted file mode 100644 index 644af7f7..00000000 --- a/lava_test_plans/projects/lkft/devices/x86 +++ /dev/null @@ -1,12 +0,0 @@ -{% extends "devices/x86" %} - -{% set MODULES_URL_COMP = MODULES_URL_COMP|default("xz") %} -{% set OVERLAY_CPUPOWER_URL_FORMAT = OVERLAY_CPUPOWER_URL_FORMAT|default("tar") %} -{% set OVERLAY_CPUPOWER_URL_COMP = OVERLAY_CPUPOWER_URL_COMP|default("xz") %} -{% set OVERLAY_KSELFTEST_URL_FORMAT = OVERLAY_KSELFTEST_URL_FORMAT|default("tar") %} -{% set OVERLAY_KSELFTEST_URL_COMP = OVERLAY_KSELFTEST_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") %} -{% set OVERLAY_URL_FORMAT = OVERLAY_URL_FORMAT|default("tar") %} -{% set OVERLAY_URL_COMP = OVERLAY_URL_COMP|default("xz") %} -{% set ROOTFS_URL_FORMAT = ROOTFS_URL_FORMAT|default("tar") %} diff --git a/lava_test_plans/projects/lkft/fastboot.jinja2 b/lava_test_plans/projects/lkft/fastboot.jinja2 deleted file mode 100644 index 8a86e09a..00000000 --- a/lava_test_plans/projects/lkft/fastboot.jinja2 +++ /dev/null @@ -1,51 +0,0 @@ -{% extends "include/fastboot.jinja2" %} - -{% block metadata %} -{% include PROJECT+"include/metadata.jinja2" %} -{% endblock metadata %} - -{% set BOOT_LABEL_OVERRIDE = BOOT_LABEL_OVERRIDE|default(false) %} -{% set DEPLOY_TARGET = DEPLOY_TARGET|default("downloads") %} -{% set DOCKER_IMAGE_DEPLOY = DOCKER_IMAGE_DEPLOY|default("linaro/kir:20240606") %} -{% set DOCKER_IMAGE_BOOT = DOCKER_IMAGE_BOOT|default("linaro/kir:20240606") %} -{% set DOCKER_IMAGE_POSTPROCESS = DOCKER_IMAGE_POSTPROCESS|default("linaro/kir:20240606") %} -{% set DOCKER_PTABLE_FILE = DOCKER_PTABLE_FILE|default("ptable-linux-8g.img") %} -{% set DOCKER_BOOT_FILE = DOCKER_BOOT_FILE|default("boot.img") %} -{% set DOCKER_ROOTFS_FILE = DOCKER_ROOTFS_FILE|default("rootfs.img") %} - -{% block deploy_target %} -{{ super() }} -{% if DEPLOY_TARGET == "downloads" %} - steps: - - /kir/lava/board_setup.sh {{DEVICE_TYPE}}{% if DEPLOY_OS == "debian" %} rootfs "/usr/"{% endif %} - -- deploy: - timeout: - minutes: {{ fastboot_deploy_timeout }} - to: fastboot - docker: - image: {{DOCKER_IMAGE_DEPLOY}} - local: true - images: -{% if ptable == true %} - {{ PTABLE_LABEL }}: - url: downloads://{{DOCKER_PTABLE_FILE}} -{% if reboot_reset == true %} - reboot: hard-reset -{% endif %} -{% endif %} -{% if boot == true and BOOT_LABEL != "kernel" or BOOT_LABEL_OVERRIDE == true %} - boot: - url: downloads://{{DOCKER_BOOT_FILE}} -{% if reboot_reset == true %} - reboot: hard-reset -{% endif %} -{% endif %} -{% if rootfs == true %} - {{ rootfs_label }}: - url: downloads://{{DOCKER_ROOTFS_FILE}} - apply-overlay: true -{% endif %} - os: {{DEPLOY_OS}} -{% endif %} -{% endblock deploy_target %} diff --git a/lava_test_plans/projects/lkft/include/metadata.jinja2 b/lava_test_plans/projects/lkft/include/metadata.jinja2 deleted file mode 100644 index 0bee1159..00000000 --- a/lava_test_plans/projects/lkft/include/metadata.jinja2 +++ /dev/null @@ -1,11 +0,0 @@ - git_ref: {{KERNEL_BRANCH | default('unknown')}} - git_repo: {{KERNEL_REPO_URL | default('unknown')}} - git_sha: {{KERNEL_COMMIT | default('unknown')}} - git_describe: {{KERNEL_DESCRIBE | default('unknown')}} - kernel_version: "{{MAKE_KERNELVERSION | default('unknown')}}" - kernel-config: {{KERNEL_CONFIG_URL | default('unknown')}} - build-url: {{BUILD_URL | default('unknown')}} - artifact-location: {{KERNEL_ARCH_ARTIFACTS_PUB_DEST | default('unknown')}} - toolchain: {{TOOLCHAIN | default('unknown')}} - email-notification: {{CI_MAIL_RECIPIENTS | default('unknown')}} - build_name: {{BUILD_NAME | default('unknown')}} diff --git a/lava_test_plans/projects/lkft/nfs.jinja2 b/lava_test_plans/projects/lkft/nfs.jinja2 deleted file mode 100644 index d08a51d0..00000000 --- a/lava_test_plans/projects/lkft/nfs.jinja2 +++ /dev/null @@ -1,5 +0,0 @@ -{% extends "nfs.jinja2" %} - -{% block metadata %} -{% include PROJECT+"include/metadata.jinja2" %} -{% endblock metadata %} diff --git a/lava_test_plans/projects/lkft/qemu.jinja2 b/lava_test_plans/projects/lkft/qemu.jinja2 deleted file mode 100644 index a1a791cc..00000000 --- a/lava_test_plans/projects/lkft/qemu.jinja2 +++ /dev/null @@ -1,39 +0,0 @@ -{% extends "qemu.jinja2" %} - -{% block metadata %} -{% include PROJECT+"include/metadata.jinja2" %} -{% endblock metadata %} - -{% 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:") %} -{% set BOOT_OS_PROMPT = BOOT_OS_PROMPT|default("root@am57xx-evm:") %} -{% set TARGET_BOOT_TIMEOUT = TARGET_BOOT_TIMEOUT|default(15) %} -{% set smp_core_count = "2" %} -{% endif %} - -{% set smp_core_count = smp_core_count|default(4) %} - -{% block rootfs_extra_args %} - {{ super() }} - image_arg: -hda {rootfs} -m 4096 -smp {{ smp_core_count }} -nographic -{% endblock rootfs_extra_args %} - -{% block test_target %} -{% if enable_tests is defined and enable_tests %} - {{ super() }} - - from: inline - repository: - metadata: - format: Lava-Test Test Definition 1.0 - name: prep-tmp-disk - description: "Link /scratch to /tmp" - run: - steps: - - df -h - - ln -s /tmp /scratch - name: prep-tmp-disk - path: inline/prep.yaml -{% endif %} -{% endblock test_target %} diff --git a/lava_test_plans/projects/lkft/variables.ini b/lava_test_plans/projects/lkft/variables.ini deleted file mode 100644 index 9faeb24b..00000000 --- a/lava_test_plans/projects/lkft/variables.ini +++ /dev/null @@ -1,66 +0,0 @@ -PROJECT_NAME=test -TAGS=tag1 -KERNEL_BRANCH=kernel-branch -KERNEL_REPO=kernel-repo -KERNEL_COMMIT=kernel-commit -KERNEL_DESCRIBE=kernel-describe -MAKE_KERNELVERSION=make-kernelversion -KERNEL_CONFIG_URL=kernel-config-url -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 -TDEFINITIONS_REVISION=tdefinitions-revision -KSELFTEST_PATH=kseslftest-path -KERNEL_URL=variable-value -MODULES_URL=variable-value -# MODULES_URL_COMP=variable-value -DTB_URL=variable-value -NFSROOTFS_URL=nfsrootfs-url -HDD_URL=hdd-url -# QCOM variables -OS_INFO=variable-value -#BOOT_URL_COMP=variable-value -ROOTFS_URL=variable-value -#ROOTFS_URL_COMP=variable-value -DEPLOY_OS=variable-value -DOCKER_ROOTFS_FILE=docker-rootfs-file -BOOT_OS_PROMPT=variable-value -SMOKE_TESTS=variable-value -PM_QA_TESTS=pm-qa-tests -DOCKER_BOOT_FILE=docker-boot -DOCKER_PTABLE_FILE=docker-boot -WLAN_DEVICE=variable-value -ETH_DEVICE=variable-value -WIFI_SSID_NAME=variable-value -WIFI_SSID_PASSWORD=variable-value -WLAN_TIME_DELAY=wlan-time-delay -GST_IGNORE_TESTS_REPO=variable-value -GST_IGNORE_TESTS_FILE=variable-value -PTEST_EXCLUDE=variable-value -QA_SERVER_PROJECT=qa-server-project -# Schneider variables -OPTEE_ITB_URL=variable-value -UBOOT_ITB_URL=variable-value -KERNEL_FIT_URL=variable-value -KERNEL_ZIMAGE_URL=variable-value -NFSROOTFS_DEV_URL=variable-value -AUTO_LOGIN_PROMPT=prompt-value -AUTO_LOGIN_USERNAME=username-value -AUTO_LOGIN_PASSWORD=password-value -PROJECT=projects/lkft/ -BOOT_LABEL=boot-label-value -DEPLOY_TARGET=downloads -# TI variables -IMAGE_URL=img-url -IMAGE_COMP=gz -# misc variables -ARTIFACTORIAL_TOKEN=1234abcd -PIGLIT_IGNORE_TESTS_REPO=false -PIGLIT_IGNORE_TESTS_FILE=foo.txt -KVM_UNIT_TESTS_REVISION= -BUILD_NAME=test diff --git a/lava_test_plans/projects/lkft/variables.yaml b/lava_test_plans/projects/lkft/variables.yaml deleted file mode 100644 index 9cf2e34b..00000000 --- a/lava_test_plans/projects/lkft/variables.yaml +++ /dev/null @@ -1,69 +0,0 @@ -"PROJECT_NAME": "test" -"TAGS": "tag1" -"KERNEL_BRANCH": "kernel-branch" -"KERNEL_REPO": "kernel-repo" -"KERNEL_COMMIT": "kernel-commit" -"KERNEL_DESCRIBE": "kernel-describe" -"MAKE_KERNELVERSION": "make-kernelversion" -"KERNEL_CONFIG_URL": "kernel-config-url" -"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" -"TDEFINITIONS_REVISION": "tdefinitions-revision" -"KSELFTEST_PATH": "kseslftest-path" -"KERNEL_URL": "variable-value" -"MODULES_URL": "variable-value" -"# MODULES_URL_FORMAT": "variable-value" -"# MODULES_URL_COMP": "variable-value" -"DTB_URL": "variable-value" -"NFSROOTFS_URL": "nfsrootfs-url" -"HDD_URL": "hdd-url" -# QCOM variables -"OS_INFO": "variable-value" -"#BOOT_URL_COMP": "variable-value" -"ROOTFS_URL": "variable-value" -"# ROOTFS_URL_FORMAT": "variable-value" -"#ROOTFS_URL_COMP": "variable-value" -"DEPLOY_OS": "variable-value" -"DOCKER_ROOTFS_FILE": "docker-rootfs-file" -"BOOT_OS_PROMPT": "variable-value" -"SMOKE_TESTS": "variable-value" -"PM_QA_TESTS": "pm-qa-tests" -"DOCKER_BOOT_FILE": "docker-boot" -"DOCKER_PTABLE_FILE": "docker-boot" -"WLAN_DEVICE": "variable-value" -"ETH_DEVICE": "variable-value" -"WIFI_SSID_NAME": "variable-value" -"WIFI_SSID_PASSWORD": "variable-value" -"WLAN_TIME_DELAY": "wlan-time-delay" -"GST_IGNORE_TESTS_REPO": "variable-value" -"GST_IGNORE_TESTS_FILE": "variable-value" -"PTEST_EXCLUDE": "variable-value" -"QA_SERVER_PROJECT": "qa-server-project" -# Schneider variables -"OPTEE_ITB_URL": "variable-value" -"UBOOT_ITB_URL": "variable-value" -"KERNEL_FIT_URL": "variable-value" -"KERNEL_ZIMAGE_URL": "variable-value" -"NFSROOTFS_DEV_URL": "variable-value" -"AUTO_LOGIN_PROMPT": "prompt-value" -"AUTO_LOGIN_USERNAME": "username-value" -"AUTO_LOGIN_PASSWORD": "password-value" -"PROJECT": "projects/lkft/" -"BOOT_LABEL": "boot-label-value" -"DEPLOY_TARGET": "downloads" -# TI variables -"IMAGE_URL": "img-url" -"IMAGE_COMP": "gz" -# misc variables -"ARTIFACTORIAL_TOKEN": "1234abcd" -"PIGLIT_IGNORE_TESTS_REPO": "false" -"PIGLIT_IGNORE_TESTS_FILE": "foo.txt" -"LAVA_TEST_NAME_SUFFIX": "" -"KVM_UNIT_TESTS_REVISION": "" -"BUILD_NAME": "test" diff --git a/lava_test_plans/projects/lt-qcom/fastboot.jinja2 b/lava_test_plans/projects/lt-qcom/fastboot.jinja2 deleted file mode 100644 index 4bf10f0b..00000000 --- a/lava_test_plans/projects/lt-qcom/fastboot.jinja2 +++ /dev/null @@ -1,175 +0,0 @@ -{% extends "include/fastboot.jinja2" %} - -{% set lxc_project = true %} -{% set lxc_install_fastboot = lxc_install_fastboot|default(true) %} -{% set lxc_install_packages = lxc_install_packages|default(true) %} -{% set DEPLOY_TARGET = DEPLOY_TARGET|default("download") %} - -{% block metadata %} - source: https://github.com/Linaro/lava-test-plans.git - path: projects/lt-qcom/ -{% if OS_INFO == 'kernel' %} -{% include PROJECT+"include/lt-qcom-"+OS_INFO+"-metadata.jinja2" %} -{% else %} -{% include PROJECT+"include/lt-qcom-distro-metadata.jinja2" %} -{% endif %} -{% endblock metadata %} - -{% block protocols %} -protocols: - lava-lxc: - name: lxc-target - template: debian - distribution: debian - release: bullseye - arch: amd64 - mirror: http://deb.debian.org/debian -{% endblock protocols %} - -{% block deploy_target %} -- deploy: - namespace: tlxc - timeout: - minutes: 15 - to: lxc -{% if lxc_install_packages == true %} - packages: - - wget - - unzip - - img2simg - - simg2img - - e2fsprogs - - gzip - - cpio - - git - - coreutils - - abootimg -{% endif %} - os: debian - -- boot: - namespace: tlxc - prompts: - - 'root@(.*):[~/]#' - timeout: - minutes: 5 - method: lxc - -{% if lxc_install_fastboot == true %} -- test: - namespace: tlxc - timeout: - minutes: 10 - definitions: - - repository: {{ TEST_DEFINITIONS_REPOSITORY }} - from: git - path: automated/linux/android-platform-tools/install.yaml - name: install-android-platform-tools-r2905 - parameters: - LINK: 'https://dl.google.com/android/repository/platform-tools_r29.0.5-linux.zip' -{% endif %} - -{{ super() }} - -{% if rootfs == true %} -- test: - namespace: tlxc - timeout: - minutes: 30 - definitions: - - from: inline - name: resize-rootfs - path: inline/resize-rootfs.yaml - repository: - metadata: - description: resize rootfs image for test overlay - format: Lava-Test Test Definition 1.0 - name: resize-rootfs - run: - steps: - - cd /lava-lxc - - overlay_file=/lava-lxc/overlays/target/overlay.tar.gz - - overlay_size=$(gzip -l $overlay_file | tail -1 | awk '{print $2}') - - overlay_size=$(( $overlay_size / 1024 )) - - simg2img {{LXC_ROOTFS_FILE}} {{LXC_ROOTFS_FILE}}.ext4 - - free_blocks=$(dumpe2fs -h {{LXC_ROOTFS_FILE}}.ext4 | grep "Free blocks" | awk '{print $3}') - - block_size=$(dumpe2fs -h {{LXC_ROOTFS_FILE}}.ext4 | grep "Block size" | awk '{print $3}') - - free_size=$(( $block_size * $free_blocks / 1024 )) - - if [ "$free_size" -lt "$overlay_size" ]; then - - block_count=$(dumpe2fs -h {{LXC_ROOTFS_FILE}}.ext4 | grep "Block count" | awk '{print $3}') - - current_size=$(( $block_size * $block_count / 1024 )) - - extra_size=32768 - - final_size=$(( $current_size + $overlay_size + $extra_size )) - - fsck_code=$(e2fsck -y -f {{LXC_ROOTFS_FILE}}.ext4) - - resize2fs {{LXC_ROOTFS_FILE}}.ext4 "$final_size"K - - img2simg {{LXC_ROOTFS_FILE}}.ext4 {{LXC_ROOTFS_FILE}} - - lava-test-case "resize_rootfs" --result "pass" - - else - - lava-test-case "resize_rootfs" --result "skip" - - fi -{% endif %} - -{% if apply_overlay == 'bootimg' %} -- test: - namespace: tlxc - timeout: - minutes: 30 - definitions: - - from: inline - name: apply-test-overlay-bootimg - path: inline/apply-test-overlay-bootimg.yaml - repository: - metadata: - description: Apply test overlay to Andoid boot image ramdisk - format: Lava-Test Test Definition 1.0 - name: apply-test-overlay-bootimg - run: - steps: - - overlay_file=/lava-lxc/overlays/target/overlay.tar.gz - - if [ -f $overlay_file ] - - then - - configs_dir=$(mktemp -d /tmp/configs.XXXX) - - git clone --depth 1 http://git.linaro.org/ci/job/configs.git $configs_dir - - $configs_dir/lt-qcom-linux-test/copy_test_overlay.sh /lava-lxc/{{LXC_BOOT_FILE}} $overlay_file - - lava-test-case "apply_test_overlay_bootimg" --result "pass" - - else - - lava-test-case "apply_test_overlay_bootimg" --result "skip" - - fi -{% endif %} - -- deploy: - timeout: - minutes: 40 - to: fastboot - namespace: target - images: -{% if ptable == true %} - "{{ PTABLE_LABEL }}": - url: lxc:///{{ LXC_PTABLE_FILE }} -{% if reboot_reset == true %} - reboot: hard-reset -{% endif %} -{% endif %} - boot: - url: lxc:///{{LXC_BOOT_FILE}} -{% if rootfs == true %} - {{ rootfs_label }}: - url: lxc:///{{LXC_ROOTFS_FILE}} - apply-overlay: true -{% endif %} - os: {{DEPLOY_OS}} -{% if pre_power_command is defined and pre_power_command == true %} - protocols: - lava-lxc: - - action: fastboot-deploy - request: pre-power-command - timeout: - minutes: 2 -{% endif %} -{% endblock deploy_target %} - -{% block pre_boot_command %} -{% endblock pre_boot_command %} - -{% block post_boot_command %} -{% endblock post_boot_command %} diff --git a/lava_test_plans/projects/lt-qcom/README.md b/lava_test_plans/projects/meta-qcom/README.md similarity index 100% rename from lava_test_plans/projects/lt-qcom/README.md rename to lava_test_plans/projects/meta-qcom/README.md diff --git a/lava_test_plans/projects/lt-qcom/devices/dragonboard-410c b/lava_test_plans/projects/meta-qcom/devices/dragonboard-410c similarity index 100% rename from lava_test_plans/projects/lt-qcom/devices/dragonboard-410c rename to lava_test_plans/projects/meta-qcom/devices/dragonboard-410c diff --git a/lava_test_plans/projects/lt-qcom/devices/dragonboard-820c b/lava_test_plans/projects/meta-qcom/devices/dragonboard-820c similarity index 100% rename from lava_test_plans/projects/lt-qcom/devices/dragonboard-820c rename to lava_test_plans/projects/meta-qcom/devices/dragonboard-820c diff --git a/lava_test_plans/projects/lt-qcom/devices/dragonboard-845c b/lava_test_plans/projects/meta-qcom/devices/dragonboard-845c similarity index 100% rename from lava_test_plans/projects/lt-qcom/devices/dragonboard-845c rename to lava_test_plans/projects/meta-qcom/devices/dragonboard-845c diff --git a/lava_test_plans/projects/lt-qcom/devices/qcs404-evb-1k b/lava_test_plans/projects/meta-qcom/devices/qcs404-evb-1k similarity index 100% rename from lava_test_plans/projects/lt-qcom/devices/qcs404-evb-1k rename to lava_test_plans/projects/meta-qcom/devices/qcs404-evb-1k diff --git a/lava_test_plans/projects/lt-qcom/devices/qcs404-evb-4k b/lava_test_plans/projects/meta-qcom/devices/qcs404-evb-4k similarity index 100% rename from lava_test_plans/projects/lt-qcom/devices/qcs404-evb-4k rename to lava_test_plans/projects/meta-qcom/devices/qcs404-evb-4k diff --git a/lava_test_plans/projects/lt-qcom/devices/sdm845-mtp b/lava_test_plans/projects/meta-qcom/devices/sdm845-mtp similarity index 100% rename from lava_test_plans/projects/lt-qcom/devices/sdm845-mtp rename to lava_test_plans/projects/meta-qcom/devices/sdm845-mtp diff --git a/lava_test_plans/projects/lt-qcom/devices/sm8150-mtp b/lava_test_plans/projects/meta-qcom/devices/sm8150-mtp similarity index 100% rename from lava_test_plans/projects/lt-qcom/devices/sm8150-mtp rename to lava_test_plans/projects/meta-qcom/devices/sm8150-mtp diff --git a/lava_test_plans/projects/lt-qcom/devices/sm8250-mtp b/lava_test_plans/projects/meta-qcom/devices/sm8250-mtp similarity index 100% rename from lava_test_plans/projects/lt-qcom/devices/sm8250-mtp rename to lava_test_plans/projects/meta-qcom/devices/sm8250-mtp diff --git a/lava_test_plans/projects/lt-qcom/devices/sm8350-mtp b/lava_test_plans/projects/meta-qcom/devices/sm8350-mtp similarity index 100% rename from lava_test_plans/projects/lt-qcom/devices/sm8350-mtp rename to lava_test_plans/projects/meta-qcom/devices/sm8350-mtp diff --git a/lava_test_plans/projects/meta-qcom/fastboot.jinja2 b/lava_test_plans/projects/meta-qcom/fastboot.jinja2 new file mode 100644 index 00000000..b1a7235e --- /dev/null +++ b/lava_test_plans/projects/meta-qcom/fastboot.jinja2 @@ -0,0 +1,56 @@ +{% extends "include/fastboot.jinja2" %} + +{% set DEPLOY_TARGET = DEPLOY_TARGET|default("fastboot") %} +{% set download_postprocess_required = false %} +{% set DEPLOY_OS = "" %} +{% set BUILD_OS = BUILD_OS|default("poky-altcfg") %} +{% set BUILD_MACHINE = BUILD_MACHINE|default("qcom-armv8a") %} +{% set DOCKER_IMAGE_POSTPROCESS = DOCKER_IMAGE_POSTPROCESS|default("ghcr.io/foundriesio/lava-lmp-sign:main") %} +{% set BOOT_LABEL = "boot" %} +{% set BOOT_URL = "downloads://" + BOOT_IMG_FILE %} +{% set ROOTFS_URL = "downloads://" + ROOTFS_IMG_FILE + ".img" %} +{% set ROOTFS_URL_COMP = null %} +{% set target_deploy_timeout = 15 %} +{% set use_download_headers = use_download_headers|default(false) %} + +{% block metadata %} + source: https://github.com/Linaro/lava-test-plans.git + path: projects/meta-qcom/ +{% if OS_INFO %} +{% include PROJECT+"include/meta-qcom-"+OS_INFO+"-metadata.jinja2" %} +{% else %} +{% include PROJECT+"include/meta-qcom-metadata.jinja2" %} +{% endif %} +{% endblock metadata %} + +{% block deploy_target %} +- deploy: + timeout: + minutes: {{ target_downloads_timeout }} + to: downloads + images: + boot: +{% if use_download_headers %} + {% include PROJECT+"include/auth-header.jinja2" %} +{% endif %} + url: "{{ BUILD_DOWNLOAD_URL }}/{{ BUILD_OS }}/{{ BUILD_MACHINE }}/{{ BOOT_IMG_FILE }}" + rootfs: +{% if use_download_headers %} + {% include PROJECT+"include/auth-header.jinja2" %} +{% endif %} + url: "{{ BUILD_DOWNLOAD_URL }}/{{ BUILD_OS }}/{{ BUILD_MACHINE }}/{{ ROOTFS_IMG_FILE }}.gz" + compression: gz + postprocess: + docker: + image: {{ DOCKER_IMAGE_POSTPROCESS }} + steps: + - export IMAGE_PATH=$PWD + - img2simg {{ ROOTFS_IMG_FILE }} {{ ROOTFS_IMG_FILE }}.img +{{ super() }} +{% endblock deploy_target %} + +{% block pre_boot_command %} +{% endblock pre_boot_command %} + +{% block post_boot_command %} +{% endblock post_boot_command %} diff --git a/lava_test_plans/projects/meta-qcom/flasher.jinja2 b/lava_test_plans/projects/meta-qcom/flasher.jinja2 new file mode 100644 index 00000000..c6cb03ee --- /dev/null +++ b/lava_test_plans/projects/meta-qcom/flasher.jinja2 @@ -0,0 +1,20 @@ +{% extends "include/flasher.jinja2" %} + +{% block deploy_target %} +{{ super() }} +{% endblock deploy_target %} + +{% block metadata %} + source: https://github.com/Linaro/lava-test-plans.git + path: projects/meta-qcom/ +{% if OS_INFO %} +{% include PROJECT+"include/meta-qcom-"+OS_INFO+"-metadata.jinja2" %} +{% else %} +{% include PROJECT+"include/meta-qcom-metadata.jinja2" %} +{% endif %} +{% endblock metadata %} + +{% block context %} + lava_test_results_dir: /home/lava-%s + test_character_delay: 10 +{% endblock context %} diff --git a/lava_test_plans/projects/meta-qcom/include/auth-header.jinja2 b/lava_test_plans/projects/meta-qcom/include/auth-header.jinja2 new file mode 120000 index 00000000..702035f5 --- /dev/null +++ b/lava_test_plans/projects/meta-qcom/include/auth-header.jinja2 @@ -0,0 +1 @@ +../../../include/auth-header.jinja2 \ No newline at end of file diff --git a/lava_test_plans/projects/lt-qcom/include/lt-qcom-distro-metadata.jinja2 b/lava_test_plans/projects/meta-qcom/include/meta-qcom-metadata.jinja2 similarity index 100% rename from lava_test_plans/projects/lt-qcom/include/lt-qcom-distro-metadata.jinja2 rename to lava_test_plans/projects/meta-qcom/include/meta-qcom-metadata.jinja2 diff --git a/lava_test_plans/projects/lt-qcom/include/lt-qcom-kernel-metadata.jinja2 b/lava_test_plans/projects/meta-qcom/include/meta-qcom-poky-altcfg-metadata.jinja2 similarity index 100% rename from lava_test_plans/projects/lt-qcom/include/lt-qcom-kernel-metadata.jinja2 rename to lava_test_plans/projects/meta-qcom/include/meta-qcom-poky-altcfg-metadata.jinja2 diff --git a/lava_test_plans/projects/meta-qcom/include/meta-qcom-qcom-distro-metadata.jinja2 b/lava_test_plans/projects/meta-qcom/include/meta-qcom-qcom-distro-metadata.jinja2 new file mode 100644 index 00000000..385f21b6 --- /dev/null +++ b/lava_test_plans/projects/meta-qcom/include/meta-qcom-qcom-distro-metadata.jinja2 @@ -0,0 +1 @@ + build-url: {{BUILD_URL | default('')}} diff --git a/lava_test_plans/projects/lt-qcom/variables-db845c-rootfs.ini b/lava_test_plans/projects/meta-qcom/variables-db845c-rootfs.ini similarity index 88% rename from lava_test_plans/projects/lt-qcom/variables-db845c-rootfs.ini rename to lava_test_plans/projects/meta-qcom/variables-db845c-rootfs.ini index 1a40e670..c5d73b03 100644 --- a/lava_test_plans/projects/lt-qcom/variables-db845c-rootfs.ini +++ b/lava_test_plans/projects/meta-qcom/variables-db845c-rootfs.ini @@ -1,5 +1,5 @@ -PROJECT_NAME=lt-qcom -PROJECT=projects/lt-qcom/ +PROJECT_NAME=meta-qcom +PROJECT=projects/meta-qcom/ LAVA_JOB_PRIORITY=high BUILD_NUMBER=738 BOOT_URL=https://snapshots.linaro.org/member-builds/qcomlt/linux-integration/sdm845-db845c/738/boot-rootfs-linux-integration-v5.11-rc5-319-g2d623fc6ac5c-738-sdm845-db845c.img @@ -21,7 +21,7 @@ KERNEL_COMMIT=latest KERNEL_DESCRIBE=v5.11-rc5-319-g2d623fc6ac5c KERNEL_CONFIG=defconfig distro.config TOOLCHAIN=unknown -BUILD_URL=https://ci.linaro.org/job/lt-qcom-linux-integration/738/MACHINE=sdm845-db845c,label=docker-stretch-amd64/ +BUILD_URL=https://ci.linaro.org/job/meta-qcom-linux-integration/738/MACHINE=sdm845-db845c,label=docker-stretch-amd64/ # QCOM test variables SMOKE_TESTS="pwd, uname -a, ip a, vmstat, lsblk, lscpu" diff --git a/lava_test_plans/projects/lt-qcom/variables.ini b/lava_test_plans/projects/meta-qcom/variables.ini similarity index 79% rename from lava_test_plans/projects/lt-qcom/variables.ini rename to lava_test_plans/projects/meta-qcom/variables.ini index 4190e10a..a8dfe56c 100644 --- a/lava_test_plans/projects/lt-qcom/variables.ini +++ b/lava_test_plans/projects/meta-qcom/variables.ini @@ -1,5 +1,5 @@ -PROJECT_NAME=lt-qcom -PROJECT=projects/lt-qcom/ +PROJECT_NAME=meta-qcom +PROJECT=projects/meta-qcom/ LAVA_JOB_PRIORITY=high BUILD_NUMBER=738 BOOT_URL=https://snapshots.linaro.org/member-builds/qcomlt/linux-integration/apq8016-sbc/738/boot-linux-integration-v5.11-rc5-319-g2d623fc6ac5c-738-apq8016-sbc.img @@ -17,4 +17,4 @@ KERNEL_COMMIT=latest KERNEL_DESCRIBE=v5.11-rc5-319-g2d623fc6ac5c KERNEL_CONFIG=defconfig distro.config TOOLCHAIN=unknown -BUILD_URL=https://ci.linaro.org/job/lt-qcom-linux-integration/738/MACHINE=apq8016-sbc,label=docker-stretch-amd64/ +BUILD_URL=https://ci.linaro.org/job/meta-qcom-linux-integration/738/MACHINE=apq8016-sbc,label=docker-stretch-amd64/ diff --git a/lava_test_plans/projects/lt-qcom/variables.yaml b/lava_test_plans/projects/meta-qcom/variables.yaml similarity index 87% rename from lava_test_plans/projects/lt-qcom/variables.yaml rename to lava_test_plans/projects/meta-qcom/variables.yaml index c239e304..71787731 100644 --- a/lava_test_plans/projects/lt-qcom/variables.yaml +++ b/lava_test_plans/projects/meta-qcom/variables.yaml @@ -3,9 +3,11 @@ "BUILD_NUMBER": "123" "BOOT_URL": "boot-url" # QCOM variables -"OS_INFO": "variable-value" "BOOT_URL_COMP": "gz" +"BOOT_IMG_FILE": "boot-apq8096-db820c-qcom-armv8a.img" +"ROOTFS_IMG_FILE": "variable-value" "ROOTFS_URL": "variable-value" +"BUILD_DOWNLOAD_URL": "variable-value" "# ROOTFS_URL_FORMAT": "variable-value" "ROOTFS_URL_COMP": "xz" "DEPLOY_OS": "variable-value" @@ -23,7 +25,7 @@ "GST_IGNORE_TESTS_FILE": "variable-value" "PTEST_EXCLUDE": "variable-value" "QA_SERVER_PROJECT": "qa-server-project" -"PROJECT": "projects/lt-qcom/" +"PROJECT": "projects/meta-qcom/" "LXC_BOOT_FILE": "" "LXC_ROOTFS_FILE": "" "VIDEO_DEVICES" : {"/dev/video0": "venus-encoder", "/dev/video1": "venus-decoder"} diff --git a/lava_test_plans/projects/qcom-deb-images/devices/qcs6490-rb3gen2-core-kit b/lava_test_plans/projects/qcom-deb-images/devices/qcs6490-rb3gen2-core-kit new file mode 100644 index 00000000..0f3f6e71 --- /dev/null +++ b/lava_test_plans/projects/qcom-deb-images/devices/qcs6490-rb3gen2-core-kit @@ -0,0 +1 @@ +{% extends "devices/qcs6490-rb3gen2-core-kit" %} diff --git a/lava_test_plans/projects/qcom-deb-images/devices/qrb2210-rb1-core-kit b/lava_test_plans/projects/qcom-deb-images/devices/qrb2210-rb1-core-kit new file mode 100644 index 00000000..e99d4875 --- /dev/null +++ b/lava_test_plans/projects/qcom-deb-images/devices/qrb2210-rb1-core-kit @@ -0,0 +1 @@ +{% extends "devices/qrb2210-rb1-core-kit" %} diff --git a/lava_test_plans/projects/qcom-deb-images/flasher.jinja2 b/lava_test_plans/projects/qcom-deb-images/flasher.jinja2 new file mode 100644 index 00000000..fcfc325f --- /dev/null +++ b/lava_test_plans/projects/qcom-deb-images/flasher.jinja2 @@ -0,0 +1,17 @@ +{% extends "include/flasher.jinja2" %} + +{% set device_type = "debian-" + device_type %} + +{% block deploy_target %} +{{ super() }} +{% endblock deploy_target %} + +{% block metadata %} + source: https://github.com/Linaro/lava-test-plans.git + path: projects/qcom-deb-images/ +{% include PROJECT+"include/qcom-deb-images-metadata.jinja2" %} +{% endblock metadata %} + +{% block context %} + test_character_delay: 10 +{% endblock context %} diff --git a/lava_test_plans/projects/qcom-deb-images/include/auth-header.jinja2 b/lava_test_plans/projects/qcom-deb-images/include/auth-header.jinja2 new file mode 120000 index 00000000..702035f5 --- /dev/null +++ b/lava_test_plans/projects/qcom-deb-images/include/auth-header.jinja2 @@ -0,0 +1 @@ +../../../include/auth-header.jinja2 \ No newline at end of file diff --git a/lava_test_plans/projects/qcom-deb-images/include/qcom-deb-images-metadata.jinja2 b/lava_test_plans/projects/qcom-deb-images/include/qcom-deb-images-metadata.jinja2 new file mode 100644 index 00000000..385f21b6 --- /dev/null +++ b/lava_test_plans/projects/qcom-deb-images/include/qcom-deb-images-metadata.jinja2 @@ -0,0 +1 @@ + build-url: {{BUILD_URL | default('')}} diff --git a/lava_test_plans/projects/qcom-deb-images/variables.yaml b/lava_test_plans/projects/qcom-deb-images/variables.yaml new file mode 100644 index 00000000..71787731 --- /dev/null +++ b/lava_test_plans/projects/qcom-deb-images/variables.yaml @@ -0,0 +1,38 @@ +"PROJECT_NAME": "test" +"LAVA_JOB_PRIORITY": "99" +"BUILD_NUMBER": "123" +"BOOT_URL": "boot-url" +# QCOM variables +"BOOT_URL_COMP": "gz" +"BOOT_IMG_FILE": "boot-apq8096-db820c-qcom-armv8a.img" +"ROOTFS_IMG_FILE": "variable-value" +"ROOTFS_URL": "variable-value" +"BUILD_DOWNLOAD_URL": "variable-value" +"# ROOTFS_URL_FORMAT": "variable-value" +"ROOTFS_URL_COMP": "xz" +"DEPLOY_OS": "variable-value" +"DOCKER_ROOTFS_FILE": "docker-rootfs-file" +"BOOT_OS_PROMPT": "variable-value" +"SMOKE_TESTS": "variable-value" +"PM_QA_TESTS": "pm-qa-tests" +"DOCKER_BOOT_FILE": "docker-boot" +"WLAN_DEVICE": "variable-value" +"ETH_DEVICE": "variable-value" +"WIFI_SSID_NAME": "variable-value" +"WIFI_SSID_PASSWORD": "variable-value" +"WLAN_TIME_DELAY": "wlan-time-delay" +"GST_IGNORE_TESTS_REPO": "variable-value" +"GST_IGNORE_TESTS_FILE": "variable-value" +"PTEST_EXCLUDE": "variable-value" +"QA_SERVER_PROJECT": "qa-server-project" +"PROJECT": "projects/meta-qcom/" +"LXC_BOOT_FILE": "" +"LXC_ROOTFS_FILE": "" +"VIDEO_DEVICES" : {"/dev/video0": "venus-encoder", "/dev/video1": "venus-decoder"} +"KERNEL_BRANCH": "variable-value" +"KERNEL_REPO": "variable-value" +"KERNEL_COMMIT": "variable-value" +"KERNEL_DESCRIBE": "variable-value" +"KERNEL_CONFIG": "defconfig" +"TOOLCHAIN": "unknown" +"BUILD_URL": "https://some-url" diff --git a/lava_test_plans/projects/tf-a/devices/juno b/lava_test_plans/projects/tf-a/devices/juno deleted file mode 100644 index 4fd980fa..00000000 --- a/lava_test_plans/projects/tf-a/devices/juno +++ /dev/null @@ -1,26 +0,0 @@ -{% extends "devices/juno" %} - -{% set target_recovery_timeout = target_recovery_timeout|default(10) %} -{% set deploy_namespace = "target" %} -{% set boot_namespace = deploy_namespace %} -{% set recovery_namespace = "recovery" %} -{% set boot_connection_namespace = recovery_namespace %} -{% set target_deploy_to = "nfs" %} - -{% block metadata %} -{% include PROJECT+"include/tf-a-metadata.jinja2" %} -{% endblock metadata %} - -{% block deploy_target %} -{% if recovery_namespace is defined and RECOVERY_IMAGE is defined %} -- deploy: - namespace: recovery - timeout: - minutes: {{ target_recovery_timeout }} - to: vemsd - recovery_image: - url: {{RECOVERY_IMAGE}} - compression: {{RECOVERY_IMAGE_COMP | default('zip')}} -{% endif %} -{{ super() }} -{% endblock deploy_target %} diff --git a/lava_test_plans/projects/tf-a/include/tf-a-metadata.jinja2 b/lava_test_plans/projects/tf-a/include/tf-a-metadata.jinja2 deleted file mode 100644 index cf1ce624..00000000 --- a/lava_test_plans/projects/tf-a/include/tf-a-metadata.jinja2 +++ /dev/null @@ -1,5 +0,0 @@ - gerrit project: {{GERRIT_PROJECT}} - gerrit branch: {{GERRIT_BRANCH}} - gerrit refspec: {{GERRIT_REFSPEC}} - test groups: {{TEST_GROUP}} - build url: {{BUILD_URL | default('""')}} diff --git a/lava_test_plans/projects/tf-a/nfs.jinja2 b/lava_test_plans/projects/tf-a/nfs.jinja2 deleted file mode 100644 index 62940a9c..00000000 --- a/lava_test_plans/projects/tf-a/nfs.jinja2 +++ /dev/null @@ -1,5 +0,0 @@ -{% extends "nfs.jinja2" %} - -{% block metadata %} -{% include PROJECT+"include/tf-a-metadata.jinja2" %} -{% endblock metadata %} diff --git a/lava_test_plans/projects/tf-a/variables.yaml b/lava_test_plans/projects/tf-a/variables.yaml deleted file mode 100644 index 5fef850c..00000000 --- a/lava_test_plans/projects/tf-a/variables.yaml +++ /dev/null @@ -1,22 +0,0 @@ -"PROJECT_NAME": "tf-a" -"BUILD_NUMBER": "123" -"LAVA_JOB_PRIORITY": "99" -"ROOTFS_URL": "nfsrootfs-url" -"ROOTFS_URL_COMP": "gz" -"BOOT_OS_PROMPT": "root@(.*):~#" -# Schneider variables -"OPTEE_ITB_URL": "variable-value" -"UBOOT_ITB_URL": "variable-value" -"KERNEL_FIT_URL": "variable-value" -"KERNEL_ZIMAGE_URL": "variable-value" -"NFSROOTFS_DEV_URL": "variable-value" -"AUTO_LOGIN_PROMPT": "prompt-value" -"PROJECT": "projects/tf-a/" -"BOOT_LABEL": "boot-label-value" -"DEPLOY_TARGET": "downloads" -# TF-A variables -"GERRIT_PROJECT": "gerrit-project" -"GERRIT_BRANCH": "gerrit-branch" -"GERRIT_REFSPEC": "gerrit-refspec" -"TEST_GROUP": "test-group" -"RECOVERY_IMAGE": "recovery-image" diff --git a/lava_test_plans/projects/ti/fastboot.jinja2 b/lava_test_plans/projects/ti/fastboot.jinja2 deleted file mode 100644 index 88ede34f..00000000 --- a/lava_test_plans/projects/ti/fastboot.jinja2 +++ /dev/null @@ -1,6 +0,0 @@ -{% extends "include/fastboot.jinja2" %} - -{% block metadata %} -{% include PROJECT+"include/ti-metadata.jinja2" %} -{% endblock metadata %} - diff --git a/lava_test_plans/projects/ti/include/ti-metadata.jinja2 b/lava_test_plans/projects/ti/include/ti-metadata.jinja2 deleted file mode 100644 index a168f1dc..00000000 --- a/lava_test_plans/projects/ti/include/ti-metadata.jinja2 +++ /dev/null @@ -1 +0,0 @@ - build-url: {{BUILD_URL | default('""')}} diff --git a/lava_test_plans/projects/ti/variables.ini b/lava_test_plans/projects/ti/variables.ini deleted file mode 100644 index af8afdb3..00000000 --- a/lava_test_plans/projects/ti/variables.ini +++ /dev/null @@ -1,9 +0,0 @@ -PROJECT_NAME=ti -LAVA_JOB_PRIORITY=99 -BUILD_NUMBER=123 -QA_SERVER_PROJECT=qa-server-project -PROJECT=projects/ti/ -# TI variables -IMAGE_URL=image_url -IMAGE_COMP=gz -UBOOT_VERSION_STRING=2020.01-00442-gc00bd81ae0 diff --git a/lava_test_plans/projects/ti/variables.yaml b/lava_test_plans/projects/ti/variables.yaml deleted file mode 100644 index 8a91721e..00000000 --- a/lava_test_plans/projects/ti/variables.yaml +++ /dev/null @@ -1,9 +0,0 @@ -"PROJECT_NAME": "ti" -"LAVA_JOB_PRIORITY": "99" -"BUILD_NUMBER": "123" -"QA_SERVER_PROJECT": "qa-server-project" -"PROJECT": "projects/ti/" -# TI variables -"IMAGE_URL": "image_url" -"IMAGE_COMP": "gz" -"UBOOT_VERSION_STRING": "2020.01-00442-gc00bd81ae0" diff --git a/lava_test_plans/testcases/android-benchmarks-andebenchpro2015.yaml b/lava_test_plans/testcases/android-benchmarks-andebenchpro2015.yaml deleted file mode 100644 index cc3ea3a8..00000000 --- a/lava_test_plans/testcases/android-benchmarks-andebenchpro2015.yaml +++ /dev/null @@ -1,4 +0,0 @@ -{% extends "testcases/templates/android-benchmarks.yaml.jinja2" %} - -{% set test_timeout = 60 %} -{% set benchmark_name = "andebenchpro2015" %} diff --git a/lava_test_plans/testcases/android-benchmarks-antutu6.yaml b/lava_test_plans/testcases/android-benchmarks-antutu6.yaml deleted file mode 100644 index 7be4e887..00000000 --- a/lava_test_plans/testcases/android-benchmarks-antutu6.yaml +++ /dev/null @@ -1,4 +0,0 @@ -{% extends "testcases/templates/android-benchmarks.yaml.jinja2" %} - -{% set test_timeout = 60 %} -{% set benchmark_name = "antutu6" %} diff --git a/lava_test_plans/testcases/android-benchmarks-benchmarkpi.yaml b/lava_test_plans/testcases/android-benchmarks-benchmarkpi.yaml deleted file mode 100644 index e93b8371..00000000 --- a/lava_test_plans/testcases/android-benchmarks-benchmarkpi.yaml +++ /dev/null @@ -1,4 +0,0 @@ -{% extends "testcases/templates/android-benchmarks.yaml.jinja2" %} - -{% set test_timeout = 30 %} -{% set benchmark_name = "benchmarkpi" %} diff --git a/lava_test_plans/testcases/android-benchmarks-caffeinemark.yaml b/lava_test_plans/testcases/android-benchmarks-caffeinemark.yaml deleted file mode 100644 index f647745b..00000000 --- a/lava_test_plans/testcases/android-benchmarks-caffeinemark.yaml +++ /dev/null @@ -1,4 +0,0 @@ -{% extends "testcases/templates/android-benchmarks.yaml.jinja2" %} - -{% set test_timeout = 30 %} -{% set benchmark_name = "caffeinemark" %} diff --git a/lava_test_plans/testcases/android-benchmarks-cf-bench.yaml b/lava_test_plans/testcases/android-benchmarks-cf-bench.yaml deleted file mode 100644 index 36fb9887..00000000 --- a/lava_test_plans/testcases/android-benchmarks-cf-bench.yaml +++ /dev/null @@ -1,4 +0,0 @@ -{% extends "testcases/templates/android-benchmarks.yaml.jinja2" %} - -{% set test_timeout = 30 %} -{% set benchmark_name = "cf-bench" %} diff --git a/lava_test_plans/testcases/android-benchmarks-gearses2eclair.yaml b/lava_test_plans/testcases/android-benchmarks-gearses2eclair.yaml deleted file mode 100644 index 339e2703..00000000 --- a/lava_test_plans/testcases/android-benchmarks-gearses2eclair.yaml +++ /dev/null @@ -1,4 +0,0 @@ -{% extends "testcases/templates/android-benchmarks.yaml.jinja2" %} - -{% set test_timeout = 30 %} -{% set benchmark_name = "gearses2eclair" %} diff --git a/lava_test_plans/testcases/android-benchmarks-geekbench4.yaml b/lava_test_plans/testcases/android-benchmarks-geekbench4.yaml deleted file mode 100644 index e7c3442d..00000000 --- a/lava_test_plans/testcases/android-benchmarks-geekbench4.yaml +++ /dev/null @@ -1,4 +0,0 @@ -{% extends "testcases/templates/android-benchmarks.yaml.jinja2" %} - -{% set test_timeout = 30 %} -{% set benchmark_name = "geekbench4" %} diff --git a/lava_test_plans/testcases/android-benchmarks-glbenchmark25.yaml b/lava_test_plans/testcases/android-benchmarks-glbenchmark25.yaml deleted file mode 100644 index eb095d5c..00000000 --- a/lava_test_plans/testcases/android-benchmarks-glbenchmark25.yaml +++ /dev/null @@ -1,4 +0,0 @@ -{% extends "testcases/templates/android-benchmarks.yaml.jinja2" %} - -{% set test_timeout = 60 %} -{% set benchmark_name = "glbenchmark25" %} diff --git a/lava_test_plans/testcases/android-benchmarks-javawhetstone.yaml b/lava_test_plans/testcases/android-benchmarks-javawhetstone.yaml deleted file mode 100644 index a8d4d349..00000000 --- a/lava_test_plans/testcases/android-benchmarks-javawhetstone.yaml +++ /dev/null @@ -1,4 +0,0 @@ -{% extends "testcases/templates/android-benchmarks.yaml.jinja2" %} - -{% set test_timeout = 30 %} -{% set benchmark_name = "javawhetstone" %} diff --git a/lava_test_plans/testcases/android-benchmarks-jbench.yaml b/lava_test_plans/testcases/android-benchmarks-jbench.yaml deleted file mode 100644 index 78dbb0ba..00000000 --- a/lava_test_plans/testcases/android-benchmarks-jbench.yaml +++ /dev/null @@ -1,4 +0,0 @@ -{% extends "testcases/templates/android-benchmarks.yaml.jinja2" %} - -{% set test_timeout = 30 %} -{% set benchmark_name = "jbench" %} diff --git a/lava_test_plans/testcases/android-benchmarks-linpack.yaml b/lava_test_plans/testcases/android-benchmarks-linpack.yaml deleted file mode 100644 index f9917ba4..00000000 --- a/lava_test_plans/testcases/android-benchmarks-linpack.yaml +++ /dev/null @@ -1,4 +0,0 @@ -{% extends "testcases/templates/android-benchmarks.yaml.jinja2" %} - -{% set test_timeout = 30 %} -{% set benchmark_name = "linpack" %} diff --git a/lava_test_plans/testcases/android-benchmarks-quadrantpro.yaml b/lava_test_plans/testcases/android-benchmarks-quadrantpro.yaml deleted file mode 100644 index a1ac0392..00000000 --- a/lava_test_plans/testcases/android-benchmarks-quadrantpro.yaml +++ /dev/null @@ -1,4 +0,0 @@ -{% extends "testcases/templates/android-benchmarks.yaml.jinja2" %} - -{% set test_timeout = 30 %} -{% set benchmark_name = "quadrantpro" %} diff --git a/lava_test_plans/testcases/android-benchmarks-rl-sqlite.yaml b/lava_test_plans/testcases/android-benchmarks-rl-sqlite.yaml deleted file mode 100644 index ec5041aa..00000000 --- a/lava_test_plans/testcases/android-benchmarks-rl-sqlite.yaml +++ /dev/null @@ -1,4 +0,0 @@ -{% extends "testcases/templates/android-benchmarks.yaml.jinja2" %} - -{% set test_timeout = 30 %} -{% set benchmark_name = "rl-sqlite" %} diff --git a/lava_test_plans/testcases/android-benchmarks-scimark.yaml b/lava_test_plans/testcases/android-benchmarks-scimark.yaml deleted file mode 100644 index a5c6b062..00000000 --- a/lava_test_plans/testcases/android-benchmarks-scimark.yaml +++ /dev/null @@ -1,4 +0,0 @@ -{% extends "testcases/templates/android-benchmarks.yaml.jinja2" %} - -{% set test_timeout = 30 %} -{% set benchmark_name = "scimark" %} diff --git a/lava_test_plans/testcases/android-benchmarks-vellamo3.yaml b/lava_test_plans/testcases/android-benchmarks-vellamo3.yaml deleted file mode 100644 index 886a5abe..00000000 --- a/lava_test_plans/testcases/android-benchmarks-vellamo3.yaml +++ /dev/null @@ -1,4 +0,0 @@ -{% extends "testcases/templates/android-benchmarks.yaml.jinja2" %} - -{% set test_timeout = 30 %} -{% set benchmark_name = "vellamo3" %} diff --git a/lava_test_plans/testcases/pre-merge-basic.yaml b/lava_test_plans/testcases/pre-merge-basic.yaml new file mode 100644 index 00000000..c228c660 --- /dev/null +++ b/lava_test_plans/testcases/pre-merge-basic.yaml @@ -0,0 +1,63 @@ +{% extends "testcases/templates/master.jinja2" %} + +{% set test_name = test_name | default("pre-merge-basic") %} +{% set test_timeout = 240 %} + +{% block test_target %} + {{ super() }} + - from: git + name: "hotplug" + path: Runner/suites/Kernel/Baseport/hotplug/hotplug.yaml + repository: {{ TEST_DEFINITIONS_REPOSITORY }} + branch: individual-test-definitions + - from: git + name: "remoteproc" + path: Runner/suites/Kernel/Baseport/remoteproc/remoteproc.yaml + repository: {{ TEST_DEFINITIONS_REPOSITORY }} + branch: individual-test-definitions + - from: git + name: "CPUFreq_Validation" + path: Runner/suites/Kernel/Baseport/CPUFreq_Validation/CPUFreq_Validation.yaml + repository: {{ TEST_DEFINITIONS_REPOSITORY }} + branch: individual-test-definitions + - from: git + name: "Interrupts" + path: Runner/suites/Kernel/Baseport/Interrupts/Interrupts.yaml + repository: {{ TEST_DEFINITIONS_REPOSITORY }} + branch: individual-test-definitions + - from: git + name: "cdsp_remoteproc" + path: Runner/suites/Kernel/Baseport/cdsp_remoteproc/cdsp_remoteproc.yaml + repository: {{ TEST_DEFINITIONS_REPOSITORY }} + branch: individual-test-definitions + - from: git + name: "WiFi_Firmware_Driver" + path: Runner/suites/Connectivity/WiFi/WiFi_Firmware_Driver/WiFi_Firmware_Driver.yaml + repository: {{ TEST_DEFINITIONS_REPOSITORY }} + branch: individual-test-definitions + - from: git + name: "WiFi_OnOff" + path: Runner/suites/Connectivity/WiFi/WiFi_OnOff/WiFi_OnOff.yaml + repository: {{ TEST_DEFINITIONS_REPOSITORY }} + branch: individual-test-definitions + - from: git + name: "OpenCV" + path: Runner/suites/Multimedia/OpenCV/OpenCV.yaml + repository: {{ TEST_DEFINITIONS_REPOSITORY }} + branch: individual-test-definitions + - from: git + name: "AudioRecord" + path: Runner/suites/Multimedia/Audio/AudioRecord/AudioRecord.yaml + repository: {{ TEST_DEFINITIONS_REPOSITORY }} + branch: individual-test-definitions + - from: git + name: "irq" + path: Runner/suites/Kernel/Baseport/irq/irq.yaml + repository: {{ TEST_DEFINITIONS_REPOSITORY }} + branch: individual-test-definitions + - from: git + name: "BT_ON_OFF" + path: Runner/suites/Connectivity/Bluetooth/BT_ON_OFF/BT_ON_OFF.yaml + repository: {{ TEST_DEFINITIONS_REPOSITORY }} + branch: individual-test-definitions +{% endblock test_target %} diff --git a/lava_test_plans/testcases/templates/master.jinja2 b/lava_test_plans/testcases/templates/master.jinja2 index c7dbe05c..a6fa6837 100644 --- a/lava_test_plans/testcases/templates/master.jinja2 +++ b/lava_test_plans/testcases/templates/master.jinja2 @@ -4,16 +4,16 @@ {% set BUILD_NUMBER = BUILD_NUMBER|default("") %} {% set KERNEL_BRANCH = KERNEL_BRANCH|default("unknown") %} {% set OS_INFO = OS_INFO|default("") %} -{% set EXTRA_KERNEL_ARGS = ' systemd.log_level=warning ' + EXTRA_KERNEL_ARGS|default("") %} +{% set EXTRA_KERNEL_ARGS = EXTRA_KERNEL_ARGS|default() %} {# with the BUILD_NUMBER in the middle, it's possible to get #} {# the sub job name(which is the test_name here) #} {# from this lava job name information #} -{% block job_name %}{{PROJECT_NAME}}-{{OS_INFO}}-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-{{test_name}}{% endblock job_name %} +{% block job_name %}{{PROJECT_NAME}}-{{OS_INFO}}-{{BUILD_NUMBER}}-{{test_name}}{% endblock job_name %} {% block context %} {{ super() }} - {%- if EXTRA_KERNEL_ARGS is defined %} + {%- if EXTRA_KERNEL_ARGS is defined and EXTRA_KERNEL_ARGS %} extra_kernel_args: '{{EXTRA_KERNEL_ARGS}}' {%- endif %} {% endblock context %} diff --git a/lava_test_plans/testplans/armnn-benchmarking/armnn-benchmarking.yaml b/lava_test_plans/testplans/armnn-benchmarking/armnn-benchmarking.yaml deleted file mode 120000 index dfebf1df..00000000 --- a/lava_test_plans/testplans/armnn-benchmarking/armnn-benchmarking.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/armnn-benchmarking.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/armnn-benchmarking/pyarmnn-bench.yaml b/lava_test_plans/testplans/armnn-benchmarking/pyarmnn-bench.yaml deleted file mode 120000 index 7fa340c0..00000000 --- a/lava_test_plans/testplans/armnn-benchmarking/pyarmnn-bench.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/pyarmnn-bench.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/armnn/armnn.yaml b/lava_test_plans/testplans/armnn/armnn.yaml deleted file mode 120000 index 94923e3b..00000000 --- a/lava_test_plans/testplans/armnn/armnn.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/armnn.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-full/ltp-containers.yaml b/lava_test_plans/testplans/lkft-full/ltp-containers.yaml deleted file mode 120000 index 7cf26e57..00000000 --- a/lava_test_plans/testplans/lkft-full/ltp-containers.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-containers.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-full/ltp-controllers.yaml b/lava_test_plans/testplans/lkft-full/ltp-controllers.yaml deleted file mode 120000 index 53315330..00000000 --- a/lava_test_plans/testplans/lkft-full/ltp-controllers.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-controllers.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-full/ltp-cve.yaml b/lava_test_plans/testplans/lkft-full/ltp-cve.yaml deleted file mode 120000 index 73728fdd..00000000 --- a/lava_test_plans/testplans/lkft-full/ltp-cve.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-cve.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-full/ltp-fs.yaml b/lava_test_plans/testplans/lkft-full/ltp-fs.yaml deleted file mode 120000 index 3793fec2..00000000 --- a/lava_test_plans/testplans/lkft-full/ltp-fs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-fs.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-full/ltp-hugetlb-mm.yaml b/lava_test_plans/testplans/lkft-full/ltp-hugetlb-mm.yaml deleted file mode 120000 index feb89e80..00000000 --- a/lava_test_plans/testplans/lkft-full/ltp-hugetlb-mm.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-hugetlb-mm.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-full/ltp-io-dio.yaml b/lava_test_plans/testplans/lkft-full/ltp-io-dio.yaml deleted file mode 120000 index 94b5feb1..00000000 --- a/lava_test_plans/testplans/lkft-full/ltp-io-dio.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-io-dio.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-full/ltp-ipc.yaml b/lava_test_plans/testplans/lkft-full/ltp-ipc.yaml deleted file mode 120000 index 0a07aee7..00000000 --- a/lava_test_plans/testplans/lkft-full/ltp-ipc.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-ipc.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-full/ltp-math.yaml b/lava_test_plans/testplans/lkft-full/ltp-math.yaml deleted file mode 120000 index 8698c414..00000000 --- a/lava_test_plans/testplans/lkft-full/ltp-math.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-math.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-full/ltp-sched.yaml b/lava_test_plans/testplans/lkft-full/ltp-sched.yaml deleted file mode 120000 index e82c1fbf..00000000 --- a/lava_test_plans/testplans/lkft-full/ltp-sched.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-sched.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-full/ltp-short-run-1.yaml b/lava_test_plans/testplans/lkft-full/ltp-short-run-1.yaml deleted file mode 120000 index 7b5c931f..00000000 --- a/lava_test_plans/testplans/lkft-full/ltp-short-run-1.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-short-run-1.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-full/ltp-short-run-2.yaml b/lava_test_plans/testplans/lkft-full/ltp-short-run-2.yaml deleted file mode 120000 index c68c2c38..00000000 --- a/lava_test_plans/testplans/lkft-full/ltp-short-run-2.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-short-run-2.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-full/ltp-short-run-3.yaml b/lava_test_plans/testplans/lkft-full/ltp-short-run-3.yaml deleted file mode 120000 index 2103df85..00000000 --- a/lava_test_plans/testplans/lkft-full/ltp-short-run-3.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-short-run-3.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-full/ltp-syscalls.yaml b/lava_test_plans/testplans/lkft-full/ltp-syscalls.yaml deleted file mode 120000 index 79706884..00000000 --- a/lava_test_plans/testplans/lkft-full/ltp-syscalls.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-syscalls.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-full/ltp-tracing.yaml b/lava_test_plans/testplans/lkft-full/ltp-tracing.yaml deleted file mode 120000 index 39c9ef27..00000000 --- a/lava_test_plans/testplans/lkft-full/ltp-tracing.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-tracing.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-full/v4l2-compliance.yaml b/lava_test_plans/testplans/lkft-full/v4l2-compliance.yaml deleted file mode 120000 index a9e4ae72..00000000 --- a/lava_test_plans/testplans/lkft-full/v4l2-compliance.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/v4l2-compliance.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-kselftest/kselftest-android.yaml b/lava_test_plans/testplans/lkft-kselftest/kselftest-android.yaml deleted file mode 120000 index e8bf8ad7..00000000 --- a/lava_test_plans/testplans/lkft-kselftest/kselftest-android.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/kselftest-android.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-kselftest/kselftest-drivers.yaml b/lava_test_plans/testplans/lkft-kselftest/kselftest-drivers.yaml deleted file mode 120000 index 780b9ef9..00000000 --- a/lava_test_plans/testplans/lkft-kselftest/kselftest-drivers.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/kselftest-drivers.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-kselftest/kselftest-net-2.yaml b/lava_test_plans/testplans/lkft-kselftest/kselftest-net-2.yaml deleted file mode 120000 index 49c810f4..00000000 --- a/lava_test_plans/testplans/lkft-kselftest/kselftest-net-2.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/kselftest-net-2.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-kselftest/kselftest-net-forwarding.yaml b/lava_test_plans/testplans/lkft-kselftest/kselftest-net-forwarding.yaml deleted file mode 120000 index 8b8e3bd6..00000000 --- a/lava_test_plans/testplans/lkft-kselftest/kselftest-net-forwarding.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/kselftest-net-forwarding.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-kselftest/kselftest-net-mptcp.yaml b/lava_test_plans/testplans/lkft-kselftest/kselftest-net-mptcp.yaml deleted file mode 120000 index 56056aba..00000000 --- a/lava_test_plans/testplans/lkft-kselftest/kselftest-net-mptcp.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/kselftest-net-mptcp.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-kselftest/kselftest-net.yaml b/lava_test_plans/testplans/lkft-kselftest/kselftest-net.yaml deleted file mode 120000 index 87352988..00000000 --- a/lava_test_plans/testplans/lkft-kselftest/kselftest-net.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/kselftest-net.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-kselftest/kselftest-short-run-1.yaml b/lava_test_plans/testplans/lkft-kselftest/kselftest-short-run-1.yaml deleted file mode 120000 index 6cf7e26d..00000000 --- a/lava_test_plans/testplans/lkft-kselftest/kselftest-short-run-1.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/kselftest-short-run-1.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-kselftest/kselftest-short-run-2.yaml b/lava_test_plans/testplans/lkft-kselftest/kselftest-short-run-2.yaml deleted file mode 120000 index 4d491170..00000000 --- a/lava_test_plans/testplans/lkft-kselftest/kselftest-short-run-2.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/kselftest-short-run-2.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-kselftest/kselftest-short-run-3.yaml b/lava_test_plans/testplans/lkft-kselftest/kselftest-short-run-3.yaml deleted file mode 120000 index e77e58ce..00000000 --- a/lava_test_plans/testplans/lkft-kselftest/kselftest-short-run-3.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/kselftest-short-run-3.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-kselftest/kselftest-short-run-4.yaml b/lava_test_plans/testplans/lkft-kselftest/kselftest-short-run-4.yaml deleted file mode 120000 index b6930a30..00000000 --- a/lava_test_plans/testplans/lkft-kselftest/kselftest-short-run-4.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/kselftest-short-run-4.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-kselftest/kselftest-short-run-5.yaml b/lava_test_plans/testplans/lkft-kselftest/kselftest-short-run-5.yaml deleted file mode 120000 index e0f8a2c3..00000000 --- a/lava_test_plans/testplans/lkft-kselftest/kselftest-short-run-5.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/kselftest-short-run-5.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-kselftest/kselftest-short-run-6.yaml b/lava_test_plans/testplans/lkft-kselftest/kselftest-short-run-6.yaml deleted file mode 120000 index 5d6d7f87..00000000 --- a/lava_test_plans/testplans/lkft-kselftest/kselftest-short-run-6.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/kselftest-short-run-6.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-kselftest/kselftest-short-run-7.yaml b/lava_test_plans/testplans/lkft-kselftest/kselftest-short-run-7.yaml deleted file mode 120000 index cfefa2ba..00000000 --- a/lava_test_plans/testplans/lkft-kselftest/kselftest-short-run-7.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/kselftest-short-run-7.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-ltp/ltp-containers.yaml b/lava_test_plans/testplans/lkft-ltp/ltp-containers.yaml deleted file mode 120000 index 7cf26e57..00000000 --- a/lava_test_plans/testplans/lkft-ltp/ltp-containers.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-containers.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-ltp/ltp-controllers.yaml b/lava_test_plans/testplans/lkft-ltp/ltp-controllers.yaml deleted file mode 120000 index 53315330..00000000 --- a/lava_test_plans/testplans/lkft-ltp/ltp-controllers.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-controllers.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-ltp/ltp-cve.yaml b/lava_test_plans/testplans/lkft-ltp/ltp-cve.yaml deleted file mode 120000 index 73728fdd..00000000 --- a/lava_test_plans/testplans/lkft-ltp/ltp-cve.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-cve.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-ltp/ltp-fs.yaml b/lava_test_plans/testplans/lkft-ltp/ltp-fs.yaml deleted file mode 120000 index 3793fec2..00000000 --- a/lava_test_plans/testplans/lkft-ltp/ltp-fs.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-fs.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-ltp/ltp-hugetlb-mm.yaml b/lava_test_plans/testplans/lkft-ltp/ltp-hugetlb-mm.yaml deleted file mode 120000 index feb89e80..00000000 --- a/lava_test_plans/testplans/lkft-ltp/ltp-hugetlb-mm.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-hugetlb-mm.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-ltp/ltp-io-dio.yaml b/lava_test_plans/testplans/lkft-ltp/ltp-io-dio.yaml deleted file mode 120000 index 94b5feb1..00000000 --- a/lava_test_plans/testplans/lkft-ltp/ltp-io-dio.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-io-dio.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-ltp/ltp-ipc.yaml b/lava_test_plans/testplans/lkft-ltp/ltp-ipc.yaml deleted file mode 120000 index 0a07aee7..00000000 --- a/lava_test_plans/testplans/lkft-ltp/ltp-ipc.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-ipc.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-ltp/ltp-math.yaml b/lava_test_plans/testplans/lkft-ltp/ltp-math.yaml deleted file mode 120000 index 8698c414..00000000 --- a/lava_test_plans/testplans/lkft-ltp/ltp-math.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-math.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-ltp/ltp-sched.yaml b/lava_test_plans/testplans/lkft-ltp/ltp-sched.yaml deleted file mode 120000 index e82c1fbf..00000000 --- a/lava_test_plans/testplans/lkft-ltp/ltp-sched.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-sched.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-ltp/ltp-short-run-1.yaml b/lava_test_plans/testplans/lkft-ltp/ltp-short-run-1.yaml deleted file mode 120000 index 7b5c931f..00000000 --- a/lava_test_plans/testplans/lkft-ltp/ltp-short-run-1.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-short-run-1.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-ltp/ltp-short-run-2.yaml b/lava_test_plans/testplans/lkft-ltp/ltp-short-run-2.yaml deleted file mode 120000 index c68c2c38..00000000 --- a/lava_test_plans/testplans/lkft-ltp/ltp-short-run-2.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-short-run-2.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-ltp/ltp-short-run-3.yaml b/lava_test_plans/testplans/lkft-ltp/ltp-short-run-3.yaml deleted file mode 120000 index 2103df85..00000000 --- a/lava_test_plans/testplans/lkft-ltp/ltp-short-run-3.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-short-run-3.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-ltp/ltp-syscalls.yaml b/lava_test_plans/testplans/lkft-ltp/ltp-syscalls.yaml deleted file mode 120000 index 79706884..00000000 --- a/lava_test_plans/testplans/lkft-ltp/ltp-syscalls.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-syscalls.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-ltp/ltp-tracing.yaml b/lava_test_plans/testplans/lkft-ltp/ltp-tracing.yaml deleted file mode 120000 index 39c9ef27..00000000 --- a/lava_test_plans/testplans/lkft-ltp/ltp-tracing.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-tracing.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-rt/pi-stress.yaml b/lava_test_plans/testplans/lkft-rt/pi-stress.yaml deleted file mode 120000 index 239f42ea..00000000 --- a/lava_test_plans/testplans/lkft-rt/pi-stress.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/pi-stress.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-rt/pmqtest.yaml b/lava_test_plans/testplans/lkft-rt/pmqtest.yaml deleted file mode 120000 index 1bdd3a23..00000000 --- a/lava_test_plans/testplans/lkft-rt/pmqtest.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/pmqtest.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-rt/ptsematest.yaml b/lava_test_plans/testplans/lkft-rt/ptsematest.yaml deleted file mode 120000 index bf2cd256..00000000 --- a/lava_test_plans/testplans/lkft-rt/ptsematest.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ptsematest.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-rt/rt-migrate-test.yaml b/lava_test_plans/testplans/lkft-rt/rt-migrate-test.yaml deleted file mode 120000 index 41c33a70..00000000 --- a/lava_test_plans/testplans/lkft-rt/rt-migrate-test.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/rt-migrate-test.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-rt/signaltest.yaml b/lava_test_plans/testplans/lkft-rt/signaltest.yaml deleted file mode 120000 index 2a901a4d..00000000 --- a/lava_test_plans/testplans/lkft-rt/signaltest.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/signaltest.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-rt/sigwaittest.yaml b/lava_test_plans/testplans/lkft-rt/sigwaittest.yaml deleted file mode 120000 index 1b3b5da9..00000000 --- a/lava_test_plans/testplans/lkft-rt/sigwaittest.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/sigwaittest.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-rt/svsematest.yaml b/lava_test_plans/testplans/lkft-rt/svsematest.yaml deleted file mode 120000 index 71c69e96..00000000 --- a/lava_test_plans/testplans/lkft-rt/svsematest.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/svsematest.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lkft-sanity/ltp-quickhit.yaml b/lava_test_plans/testplans/lkft-sanity/ltp-quickhit.yaml deleted file mode 120000 index fe0873c3..00000000 --- a/lava_test_plans/testplans/lkft-sanity/ltp-quickhit.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ltp-quickhit.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lt-qcom/distro/bt.yaml b/lava_test_plans/testplans/lt-qcom/distro/bt.yaml deleted file mode 120000 index 6131b2f8..00000000 --- a/lava_test_plans/testplans/lt-qcom/distro/bt.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../testcases/bt.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lt-qcom/distro/distro-smoke.yaml b/lava_test_plans/testplans/lt-qcom/distro/distro-smoke.yaml deleted file mode 120000 index 1be63f5f..00000000 --- a/lava_test_plans/testplans/lt-qcom/distro/distro-smoke.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../testcases/distro-smoke.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lt-qcom/distro/pmwg.yaml b/lava_test_plans/testplans/lt-qcom/distro/pmwg.yaml deleted file mode 120000 index 0b36af68..00000000 --- a/lava_test_plans/testplans/lt-qcom/distro/pmwg.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../testcases/pmwg.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lt-qcom/distro/wifi.yaml b/lava_test_plans/testplans/lt-qcom/distro/wifi.yaml deleted file mode 120000 index 4d858d0f..00000000 --- a/lava_test_plans/testplans/lt-qcom/distro/wifi.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../testcases/wifi.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lt-qcom/kernel/kernel-benchmark.yaml b/lava_test_plans/testplans/lt-qcom/kernel/kernel-benchmark.yaml deleted file mode 120000 index a0815408..00000000 --- a/lava_test_plans/testplans/lt-qcom/kernel/kernel-benchmark.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../testcases/kernel-benchmark.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lt-qcom/kernel/kernel-bootrr.yaml b/lava_test_plans/testplans/lt-qcom/kernel/kernel-bootrr.yaml deleted file mode 120000 index 1001145a..00000000 --- a/lava_test_plans/testplans/lt-qcom/kernel/kernel-bootrr.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../testcases/kernel-bootrr.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lt-qcom/kernel/kernel-desktop.yaml b/lava_test_plans/testplans/lt-qcom/kernel/kernel-desktop.yaml deleted file mode 120000 index e14962fb..00000000 --- a/lava_test_plans/testplans/lt-qcom/kernel/kernel-desktop.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../testcases/kernel-desktop.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lt-qcom/kernel/kernel-multimedia.yaml b/lava_test_plans/testplans/lt-qcom/kernel/kernel-multimedia.yaml deleted file mode 120000 index 00205084..00000000 --- a/lava_test_plans/testplans/lt-qcom/kernel/kernel-multimedia.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../testcases/kernel-multimedia.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/lt-qcom/kernel/kernel-smoke.yaml b/lava_test_plans/testplans/lt-qcom/kernel/kernel-smoke.yaml deleted file mode 120000 index b3ba9956..00000000 --- a/lava_test_plans/testplans/lt-qcom/kernel/kernel-smoke.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../testcases/kernel-smoke.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/meta-qcom/poky-altcfg/boot/boot.yaml b/lava_test_plans/testplans/meta-qcom/poky-altcfg/boot/boot.yaml new file mode 120000 index 00000000..ce7d73fc --- /dev/null +++ b/lava_test_plans/testplans/meta-qcom/poky-altcfg/boot/boot.yaml @@ -0,0 +1 @@ +../../../../testcases/boot.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/meta-qcom/qcom-distro/boot/boot.yaml b/lava_test_plans/testplans/meta-qcom/qcom-distro/boot/boot.yaml new file mode 120000 index 00000000..ce7d73fc --- /dev/null +++ b/lava_test_plans/testplans/meta-qcom/qcom-distro/boot/boot.yaml @@ -0,0 +1 @@ +../../../../testcases/boot.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/meta-qcom/qcom-distro/pre-merge/pre-merge-basic.yaml b/lava_test_plans/testplans/meta-qcom/qcom-distro/pre-merge/pre-merge-basic.yaml new file mode 120000 index 00000000..fd9626ca --- /dev/null +++ b/lava_test_plans/testplans/meta-qcom/qcom-distro/pre-merge/pre-merge-basic.yaml @@ -0,0 +1 @@ +../../../../testcases/pre-merge-basic.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/ml-bench/ml-bench.yaml b/lava_test_plans/testplans/ml-bench/ml-bench.yaml deleted file mode 100644 index 03f02632..00000000 --- a/lava_test_plans/testplans/ml-bench/ml-bench.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/ml-bench.yaml diff --git a/lava_test_plans/testplans/tf-a/boot.yaml b/lava_test_plans/testplans/qcom-deb-images/boot.yaml similarity index 100% rename from lava_test_plans/testplans/tf-a/boot.yaml rename to lava_test_plans/testplans/qcom-deb-images/boot.yaml diff --git a/lava_test_plans/testplans/schneider/network-basic-tests.yaml b/lava_test_plans/testplans/schneider/network-basic-tests.yaml deleted file mode 120000 index 5949b845..00000000 --- a/lava_test_plans/testplans/schneider/network-basic-tests.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/network-basic-tests.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/schneider/u-boot.yaml b/lava_test_plans/testplans/schneider/u-boot.yaml deleted file mode 120000 index f727dfbd..00000000 --- a/lava_test_plans/testplans/schneider/u-boot.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/u-boot.yaml \ No newline at end of file diff --git a/lava_test_plans/testplans/ti-uboot/u-boot.yaml b/lava_test_plans/testplans/ti-uboot/u-boot.yaml deleted file mode 120000 index f727dfbd..00000000 --- a/lava_test_plans/testplans/ti-uboot/u-boot.yaml +++ /dev/null @@ -1 +0,0 @@ -../../testcases/u-boot.yaml \ No newline at end of file diff --git a/lava_test_plans/utils.py b/lava_test_plans/utils.py index 1492a533..960a17e0 100644 --- a/lava_test_plans/utils.py +++ b/lava_test_plans/utils.py @@ -14,8 +14,6 @@ from ruamel.yaml import YAML -FORMAT = "[%(funcName)16s() ] %(message)s" -logging.basicConfig(level=logging.INFO, format=FORMAT) logger = logging.getLogger(__name__) @@ -26,7 +24,8 @@ def get_context(script_dirname, args_variables, args_overwrite_variables): variables = os.path.join(script_dirname, variables) try: context.update(ConfigObj(variables).dict()) - except ConfigObjError: + except ConfigObjError as e: + logger.info(e) logger.info("Unable to parse .ini file") logger.info("Trying YAML") with open(variables, "r") as vars_file: diff --git a/pyproject.toml b/pyproject.toml index d3e2182a..6ffc6dbc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi" [project] name = "lava-test-plans" -authors = [{name = "Anders Roxell", email = "anders.roxell@linaro.org"}] +authors = [{name = "Milosz Wasilewski", email = "milosz.wasilewski@oss.qualcomm.com"}] readme = "README.md" license = {file = "LICENSE"} classifiers = ["License :: OSI Approved :: MIT License"] @@ -25,4 +25,4 @@ lava-test-plans = "lava_test_plans.__main__:main" name = "lava_test_plans" [project.urls] -Source = "https://github.com/linaro/lava-test-plans" +Source = "https://github.com/qualcomm-linux/lava-test-plans" diff --git a/test/test_lava_job_visibility.py b/test/test_lava_job_visibility.py index 4e5080cd..e4daa2a4 100644 --- a/test/test_lava_job_visibility.py +++ b/test/test_lava_job_visibility.py @@ -11,7 +11,7 @@ "" if os.getenv("SKIP_TEST_LAVA_VALIDITY") else "--test-lava-validity" ) -devices = ["hi960-hikey", "x15", "qemu_arm64"] +devices = ["qemu_arm64"] testcase = "ltp-syscalls.yaml" variable_input_files = [ "test/variables-visibility.ini", diff --git a/test/test_lava_tags.py b/test/test_lava_tags.py index 914b37fb..ca13a0e0 100644 --- a/test/test_lava_tags.py +++ b/test/test_lava_tags.py @@ -11,7 +11,7 @@ "" if os.getenv("SKIP_TEST_LAVA_VALIDITY") else "--test-lava-validity" ) -devices = ["hi960-hikey", "x15", "qemu_arm64"] +devices = ["qemu_arm64"] testcase = "ltp-syscalls.yaml" variable_input_files = ["test/variables-tags.ini", "test/variables-tags-one-tag.ini"] tests = [] diff --git a/test/test_lava_test_plans.py b/test/test_lava_test_plans.py index ab10dfa3..5706efd5 100644 --- a/test/test_lava_test_plans.py +++ b/test/test_lava_test_plans.py @@ -35,106 +35,31 @@ def test_call_lava_test_plan_testcases(param): assert main() == 0 -# armnn tests -armnn_devices = [ - "hi960-hikey", - "dragonboard-845c", - "synquacer", - "stm32mp157c-dk2", - "juno", -] -assert len(armnn_devices) > 0 -armnn_testplans = ["armnn", "armnn-benchmarking"] -assert len(armnn_testplans) > 0 -armnn_variable_input_file = "projects/armnn/variables.yaml" -tests = [] -for device in armnn_devices: - for testplan in armnn_testplans: - tests.append((armnn_variable_input_file, device, testplan)) - - -@pytest.mark.parametrize("param", tests) -def test_call_lava_test_plan_testplans_armnn(param): - variable_input_file, device, testplan = param - sys.argv = shlex.split( - f'lava_test_plans --dry-run --variables "{variable_input_file}" --device-type "{device}" --test-plan "{testplan}" {test_lava_validity}' - ) - assert main() == 0 - - -# lkft tests -lkft_project_device_path = "lava_test_plans/projects/lkft/devices" -lkft_devices = [ - os.path.basename(d) for d in glob.glob("lava_test_plans/projects/lkft/devices/*") -] -assert len(lkft_devices) > 0 -lkft_testplans = ["lkft-full", "lkft-kselftest", "lkft-ltp", "lkft-rt", "lkft-sanity"] -assert len(lkft_testplans) > 0 -lkft_variable_input_file = "projects/lkft/variables.ini" -tests = [] -for device in lkft_devices: - if device == "variables": - continue - for testplan in lkft_testplans: - tests.append( - (lkft_variable_input_file, device, testplan, lkft_project_device_path) - ) - - -@pytest.mark.parametrize("param", tests) -def test_call_lava_test_plan_testplans_project_lkft(param): - variable_input_file, device, testplan, project_device_path = param - sys.argv = shlex.split( - f'lava_test_plans --dry-run --variables "{variable_input_file}" --testplan-device-path "{project_device_path}" --device-type "{device}" --test-plan "{testplan}" {test_lava_validity}' - ) - assert main() == 0 - - -# lt-qcom tests -lt_qcom_project_device_path = "lava_test_plans/projects/lt-qcom/devices" -lt_qcom_devices = [ - os.path.basename(d) for d in glob.glob("lava_test_plans/projects/lt-qcom/devices/*") -] -assert len(lt_qcom_devices) > 0 -lt_qcom_testplans = ["lt-qcom/kernel"] -assert len(lt_qcom_testplans) > 0 -lt_qcom_variable_input_file = "projects/lt-qcom/variables.yaml" -tests = [] -for device in lt_qcom_devices: - for testplan in lt_qcom_testplans: - tests.append( - (lt_qcom_variable_input_file, device, testplan, lt_qcom_project_device_path) - ) - - -@pytest.mark.parametrize("param", tests) -def test_call_lava_test_plan_testplans_project_lt_qcom(param): - variable_input_file, device, testplan, project_device_path = param - sys.argv = shlex.split( - f'lava_test_plans --dry-run --variables "{variable_input_file}" --testplan-device-path "{project_device_path}" --device-type "{device}" --test-plan "{testplan}" {test_lava_validity}' - ) - assert main() == 0 - - -# tf-a tests -tf_a_project_device_path = "lava_test_plans/projects/tf-a/devices" -tf_a_devices = [ - os.path.basename(d) for d in glob.glob("lava_test_plans/projects/tf-a/devices/*") +# meta-qcom tests +meta_qcom_project_device_path = "lava_test_plans/projects/meta-qcom/devices" +meta_qcom_devices = [ + os.path.basename(d) + for d in glob.glob("lava_test_plans/projects/meta-qcom/devices/*") ] -assert len(tf_a_devices) > 0 -tf_a_testplans = ["tf-a"] -assert len(tf_a_testplans) > 0 -tf_a_variable_input_file = "projects/tf-a/variables.yaml" +assert len(meta_qcom_devices) > 0 +meta_qcom_testplans = ["meta-qcom/poky-altcfg", "meta-qcom/qcom-distro"] +assert len(meta_qcom_testplans) > 0 +meta_qcom_variable_input_file = "projects/meta-qcom/variables.yaml" tests = [] -for device in tf_a_devices: - for testplan in tf_a_testplans: +for device in meta_qcom_devices: + for testplan in meta_qcom_testplans: tests.append( - (tf_a_variable_input_file, device, testplan, tf_a_project_device_path) + ( + meta_qcom_variable_input_file, + device, + testplan, + meta_qcom_project_device_path, + ) ) @pytest.mark.parametrize("param", tests) -def test_call_lava_test_plan_testplans_project_tf_a(param): +def test_call_lava_test_plan_testplans_project_meta_qcom(param): variable_input_file, device, testplan, project_device_path = param sys.argv = shlex.split( f'lava_test_plans --dry-run --variables "{variable_input_file}" --testplan-device-path "{project_device_path}" --device-type "{device}" --test-plan "{testplan}" {test_lava_validity}' @@ -142,87 +67,33 @@ def test_call_lava_test_plan_testplans_project_tf_a(param): assert main() == 0 -# ti tests -ti_devices = ["x15-bl"] -assert len(ti_devices) > 0 -ti_testplans = ["ti-uboot"] -assert len(ti_testplans) > 0 -ti_variable_input_file = "projects/ti/variables.yaml" -tests = [] -for device in ti_devices: - for testplan in ti_testplans: - tests.append((ti_variable_input_file, device, testplan)) - - -@pytest.mark.parametrize("param", tests) -def test_call_lava_test_plan_testplans_ti(param): - variable_input_file, device, testplan = param - sys.argv = shlex.split( - f'lava_test_plans --dry-run --variables "{variable_input_file}" --device-type "{device}" --test-plan "{testplan}" {test_lava_validity}' - ) - assert main() == 0, f"fail: {sys.argv}" - - -# lkft-android tests - -lkft_android_project_device_path = "lava_test_plans/projects/lkft-android/devices" -lkft_android_devices = [ +# qcom-deb-images tests +qcom_deb_images_project_device_path = "lava_test_plans/projects/qcom-deb-images/devices" +qcom_deb_images_devices = [ os.path.basename(d) - for d in glob.glob("lava_test_plans/projects/lkft-android/devices/*") -] -assert len(lkft_android_devices) > 0 -lkft_android_boot_testcases = ["boot.yaml"] -assert len(lkft_android_boot_testcases) > 0 -lkft_android_default_variables_file = ( - "lava_test_plans/projects/lkft-android/variables.ini" -) -lkft_android_variable_input_files = [ - lkft_android_default_variables_file, - "test/variables-lkft-android-tuxsuite.ini", + 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"] +assert len(qcom_deb_images_testplans) > 0 +qcom_deb_images_variable_input_file = "projects/qcom-deb-images/variables.yaml" tests = [] -for device in lkft_android_devices: - if device == "variables": - continue - for testcase in lkft_android_boot_testcases: - for variable_input_file in lkft_android_variable_input_files: - tests.append( - ( - variable_input_file, - device, - testcase, - lkft_android_project_device_path, - ) - ) - -lkft_android_nonboot_testcases = [ - os.path.basename(d) for d in glob.glob("lava_test_plans/testcases/android-*.yaml") -] -assert len(lkft_android_nonboot_testcases) > 0 -for device in lkft_android_devices: - if device == "variables": - continue - for testcase in lkft_android_nonboot_testcases: +for device in qcom_deb_images_devices: + for testplan in qcom_deb_images_testplans: tests.append( ( - lkft_android_default_variables_file, + qcom_deb_images_variable_input_file, device, - testcase, - lkft_android_project_device_path, + testplan, + qcom_deb_images_project_device_path, ) ) @pytest.mark.parametrize("param", tests) -def test_call_lava_test_plan_testcase_lkft_android(param): - variable_input_file, device, testcase, project_device_path = param +def test_call_lava_test_plan_testplans_project_qcom_deb_images(param): + variable_input_file, device, testplan, project_device_path = param sys.argv = shlex.split( - f"""lava_test_plans - --dry-run - --variables "{variable_input_file}" - --testplan-device-path "{project_device_path}" - --device-type "{device}" - --test-case "{testcase}" - {test_lava_validity}""" + f'lava_test_plans --dry-run --variables "{variable_input_file}" --testplan-device-path "{project_device_path}" --device-type "{device}" --test-plan "{testplan}" {test_lava_validity}' ) - assert main() == 0, f"fail: {sys.argv}" + assert main() == 0 diff --git a/test/test_validate_variables.py b/test/test_validate_variables.py index 437761cb..71b46c79 100644 --- a/test/test_validate_variables.py +++ b/test/test_validate_variables.py @@ -6,13 +6,13 @@ def test_validate_variables_happy_flow(): sys.argv = shlex.split( - f'lava_test_plans --variables "test/variables-valid.ini" --device-type "x15" --testplan-device-path "projects/lkft/devices" --validate-variables --overwrite-variables "KERNEL_BRANCH=master"' + f'lava_test_plans --variables "test/variables-valid.ini" --device-type "x86" --validate-variables --overwrite-variables "KERNEL_BRANCH=master"' ) assert main() == 0 def test_validate_variables_failure(): sys.argv = shlex.split( - f'lava_test_plans --variables "test/variables-invalid.yaml" --device-type "x15" --testplan-device-path "projects/lkft/devices" --validate-variables' + f'lava_test_plans --variables "test/variables-invalid.yaml" --device-type "x86" --validate-variables' ) assert main() == 1 diff --git a/test/variables-invalid.yaml b/test/variables-invalid.yaml index 3de84390..ca3ee8de 100644 --- a/test/variables-invalid.yaml +++ b/test/variables-invalid.yaml @@ -1,7 +1,5 @@ -DEVICE_TYPE: x15 +DEVICE_TYPE: x86 KERNEL_URL: https://storage.tuxsuite.com/public/linaro/lkft/builds/2QpEF31VyXftGwaDktiZPokVm62/zImage BOOT_URL: https://storage.tuxsuite.com/public/linaro/lkft/builds/2QpEF31VyXftGwaDktiZPokVm62/zImage MODULES_URL: https://storage.tuxsuite.com/public/linaro/lkft/builds/2QpEF31VyXftGwaDktiZPokVm62/modules.tar.xz ROOTFS_URL: https://storage.tuxsuite.com/public/linaro/lkft/oebuilds/2QYtrjk7ljZosmSAhFbSSmw8mPv/images/am57xx-evm/lkft-console-image-am57xx-evm-20230531144250.rootfs.ext4.gz -LAVA_JOB_PRIORITY: 25 -PROJECT: projects/lkft/ diff --git a/test/variables-lkft-android-tuxsuite.ini b/test/variables-lkft-android-tuxsuite.ini deleted file mode 100644 index c3203cf8..00000000 --- a/test/variables-lkft-android-tuxsuite.ini +++ /dev/null @@ -1,30 +0,0 @@ -REFERENCE_BUILD_URL="reference-build-url" -ANDROID_VERSION="android-version" -KERNEL_BRANCH="kernel-branch" -KERNEL_REPO="kernel-repo-url" -# -BUILD_URL="build-url" -BUILD_NUMBER="build-number" -JOB_NAME="job-name" -# -LKFT_BUILD_CONFIG="lkft-android-build-config" -KERNEL_COMMIT="kernel-commit" -KERNEL_DESCRIBE="kernel-describe" -# -LAVA_JOB_PRIORITY="99" -# -ANDROID_VENDOR_FINGERPRINT="android-vendor-fingerprint" -# -TUXSUITE_BAKE_VENDOR_DOWNLOAD_URL="tuxsuite-bake-vendor-download-url" -PROJECT="projects/lkft-android/" -PROJECT_NAME="lkft" -# -DEPLOY_TARGET="downloads" -OS_INFO="android" -DEPLOY_OS="android" - -# -DOCKER_IMAGE_TEST="docker-hub-url" -# -SQUAD_URL="squad-url" -SQUAD_ARCHIVE_SUBMIT_TOKEN="squad-archive-submit-token"