From c1898908a8b6e11064f9aabf37ba6fdbe48bdbe6 Mon Sep 17 00:00:00 2001 From: Vignesh Raman Date: Tue, 8 Jul 2025 10:48:49 +0530 Subject: [PATCH] ci/lava: Move lava_job_submitter tests to lava folder The `.gitlab-ci/tests/` directory contains LAVA-specific tests, not general test code. To avoid confusion with `.gitlab-ci/test/`, move it to `.gitlab-ci/lava/`. Signed-off-by: Vignesh Raman Part-of: --- .gitlab-ci/{ => lava}/tests/__init__.py | 0 .gitlab-ci/{ => lava}/tests/conftest.py | 0 .../tests/data/FASTBOOT_force_uart=False_job_definition.yaml | 0 .../tests/data/FASTBOOT_force_uart=True_job_definition.yaml | 0 .../tests/data/UBOOT_force_uart=False_job_definition.yaml | 0 .../tests/data/UBOOT_force_uart=True_job_definition.yaml | 0 .gitlab-ci/{ => lava}/tests/lava/__init__.py | 0 .gitlab-ci/{ => lava}/tests/lava/helpers.py | 0 .gitlab-ci/{ => lava}/tests/test_lava_job_submitter.py | 0 .gitlab-ci/{ => lava}/tests/utils/__init__.py | 0 .gitlab-ci/{ => lava}/tests/utils/test_lava_farm.py | 0 .gitlab-ci/{ => lava}/tests/utils/test_lava_job_definition.py | 0 .gitlab-ci/{ => lava}/tests/utils/test_lava_log.py | 0 .gitlab-ci/run-pytest.sh | 2 +- .gitlab-ci/test/gitlab-ci.yml | 2 +- 15 files changed, 2 insertions(+), 2 deletions(-) rename .gitlab-ci/{ => lava}/tests/__init__.py (100%) rename .gitlab-ci/{ => lava}/tests/conftest.py (100%) rename .gitlab-ci/{ => lava}/tests/data/FASTBOOT_force_uart=False_job_definition.yaml (100%) rename .gitlab-ci/{ => lava}/tests/data/FASTBOOT_force_uart=True_job_definition.yaml (100%) rename .gitlab-ci/{ => lava}/tests/data/UBOOT_force_uart=False_job_definition.yaml (100%) rename .gitlab-ci/{ => lava}/tests/data/UBOOT_force_uart=True_job_definition.yaml (100%) rename .gitlab-ci/{ => lava}/tests/lava/__init__.py (100%) rename .gitlab-ci/{ => lava}/tests/lava/helpers.py (100%) rename .gitlab-ci/{ => lava}/tests/test_lava_job_submitter.py (100%) rename .gitlab-ci/{ => lava}/tests/utils/__init__.py (100%) rename .gitlab-ci/{ => lava}/tests/utils/test_lava_farm.py (100%) rename .gitlab-ci/{ => lava}/tests/utils/test_lava_job_definition.py (100%) rename .gitlab-ci/{ => lava}/tests/utils/test_lava_log.py (100%) diff --git a/.gitlab-ci/tests/__init__.py b/.gitlab-ci/lava/tests/__init__.py similarity index 100% rename from .gitlab-ci/tests/__init__.py rename to .gitlab-ci/lava/tests/__init__.py diff --git a/.gitlab-ci/tests/conftest.py b/.gitlab-ci/lava/tests/conftest.py similarity index 100% rename from .gitlab-ci/tests/conftest.py rename to .gitlab-ci/lava/tests/conftest.py diff --git a/.gitlab-ci/tests/data/FASTBOOT_force_uart=False_job_definition.yaml b/.gitlab-ci/lava/tests/data/FASTBOOT_force_uart=False_job_definition.yaml similarity index 100% rename from .gitlab-ci/tests/data/FASTBOOT_force_uart=False_job_definition.yaml rename to .gitlab-ci/lava/tests/data/FASTBOOT_force_uart=False_job_definition.yaml diff --git a/.gitlab-ci/tests/data/FASTBOOT_force_uart=True_job_definition.yaml b/.gitlab-ci/lava/tests/data/FASTBOOT_force_uart=True_job_definition.yaml similarity index 100% rename from .gitlab-ci/tests/data/FASTBOOT_force_uart=True_job_definition.yaml rename to .gitlab-ci/lava/tests/data/FASTBOOT_force_uart=True_job_definition.yaml diff --git a/.gitlab-ci/tests/data/UBOOT_force_uart=False_job_definition.yaml b/.gitlab-ci/lava/tests/data/UBOOT_force_uart=False_job_definition.yaml similarity index 100% rename from .gitlab-ci/tests/data/UBOOT_force_uart=False_job_definition.yaml rename to .gitlab-ci/lava/tests/data/UBOOT_force_uart=False_job_definition.yaml diff --git a/.gitlab-ci/tests/data/UBOOT_force_uart=True_job_definition.yaml b/.gitlab-ci/lava/tests/data/UBOOT_force_uart=True_job_definition.yaml similarity index 100% rename from .gitlab-ci/tests/data/UBOOT_force_uart=True_job_definition.yaml rename to .gitlab-ci/lava/tests/data/UBOOT_force_uart=True_job_definition.yaml diff --git a/.gitlab-ci/tests/lava/__init__.py b/.gitlab-ci/lava/tests/lava/__init__.py similarity index 100% rename from .gitlab-ci/tests/lava/__init__.py rename to .gitlab-ci/lava/tests/lava/__init__.py diff --git a/.gitlab-ci/tests/lava/helpers.py b/.gitlab-ci/lava/tests/lava/helpers.py similarity index 100% rename from .gitlab-ci/tests/lava/helpers.py rename to .gitlab-ci/lava/tests/lava/helpers.py diff --git a/.gitlab-ci/tests/test_lava_job_submitter.py b/.gitlab-ci/lava/tests/test_lava_job_submitter.py similarity index 100% rename from .gitlab-ci/tests/test_lava_job_submitter.py rename to .gitlab-ci/lava/tests/test_lava_job_submitter.py diff --git a/.gitlab-ci/tests/utils/__init__.py b/.gitlab-ci/lava/tests/utils/__init__.py similarity index 100% rename from .gitlab-ci/tests/utils/__init__.py rename to .gitlab-ci/lava/tests/utils/__init__.py diff --git a/.gitlab-ci/tests/utils/test_lava_farm.py b/.gitlab-ci/lava/tests/utils/test_lava_farm.py similarity index 100% rename from .gitlab-ci/tests/utils/test_lava_farm.py rename to .gitlab-ci/lava/tests/utils/test_lava_farm.py diff --git a/.gitlab-ci/tests/utils/test_lava_job_definition.py b/.gitlab-ci/lava/tests/utils/test_lava_job_definition.py similarity index 100% rename from .gitlab-ci/tests/utils/test_lava_job_definition.py rename to .gitlab-ci/lava/tests/utils/test_lava_job_definition.py diff --git a/.gitlab-ci/tests/utils/test_lava_log.py b/.gitlab-ci/lava/tests/utils/test_lava_log.py similarity index 100% rename from .gitlab-ci/tests/utils/test_lava_log.py rename to .gitlab-ci/lava/tests/utils/test_lava_log.py diff --git a/.gitlab-ci/run-pytest.sh b/.gitlab-ci/run-pytest.sh index b5bbff8746b..90892c555bf 100755 --- a/.gitlab-ci/run-pytest.sh +++ b/.gitlab-ci/run-pytest.sh @@ -41,7 +41,7 @@ if [ "${USE_VENV:-}" == true ]; then ${PYTHON_BIN} -m pip install --break-system-packages -r "${CI_PROJECT_DIR}/bin/ci/test/requirements.txt" fi -LIB_TEST_DIR=${CI_PROJECT_DIR}/.gitlab-ci/tests +LIB_TEST_DIR=${CI_PROJECT_DIR}/.gitlab-ci/lava/tests SCRIPT_TEST_DIR=${CI_PROJECT_DIR}/bin/ci uncollapsed_section_start pytest "Running pytest" diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index da3603325dc..0884d33906d 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -91,7 +91,7 @@ yaml-toml-shell-py-test: - .shellcheckrc - bin/toml_lint.py - src/**/ci/*.toml - - .gitlab-ci/tests/**/* + - .gitlab-ci/lava/tests/**/* - bin/ci/**/* when: on_success # direct pushes that bypassed the CI