Qualcomm tests

.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

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)

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.

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)

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 %}

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 %}

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 %}

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 %}

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 %}

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 %}