From ac5c5333ae12b589d9829068fbe5b9edf9d5af64 Mon Sep 17 00:00:00 2001 From: Yongqin Liu Date: Wed, 6 Mar 2024 12:08:30 +0800 Subject: [PATCH] lkft-android: support to upload archives to SQUAD when the SQUAD_URL is defined, which will be passed by cases like in the tuxsuite setup Signed-off-by: Yongqin Liu --- lava_test_plans/include/android-boottime-definition.jinja2 | 3 +++ lava_test_plans/projects/lkft-android/fastboot.jinja2 | 2 +- lava_test_plans/projects/lkft-android/variables.ini | 3 ++- .../testcases/templates/android-benchmarks.yaml.jinja2 | 4 ++++ lava_test_plans/testcases/templates/android-xts.yaml.jinja2 | 3 +++ test/variables-lkft-android-tuxsuite.ini | 3 ++- 6 files changed, 15 insertions(+), 3 deletions(-) diff --git a/lava_test_plans/include/android-boottime-definition.jinja2 b/lava_test_plans/include/android-boottime-definition.jinja2 index b0d4d9df..101dcf5f 100644 --- a/lava_test_plans/include/android-boottime-definition.jinja2 +++ b/lava_test_plans/include/android-boottime-definition.jinja2 @@ -7,4 +7,7 @@ ANDROID_VERSION: master OPERATION: {{ test_operation }} COLLECT_NO: "{{ test_index }}" +{% if test_operation == "ANALYZE" and SQUAD_URL is defined %} + SQUAD_UPLOAD_URL: "{{SQUAD_URL}}/{{device_type}}" +{% endif %} {% endif %} diff --git a/lava_test_plans/projects/lkft-android/fastboot.jinja2 b/lava_test_plans/projects/lkft-android/fastboot.jinja2 index d2a91a7f..d0f2204d 100644 --- a/lava_test_plans/projects/lkft-android/fastboot.jinja2 +++ b/lava_test_plans/projects/lkft-android/fastboot.jinja2 @@ -46,7 +46,7 @@ {{ super() }} {% block secrets %} secrets: - ARTIFACTORIAL_TOKEN: "{{ ARTIFACTORIAL_TOKEN }}" + SQUAD_ARCHIVE_SUBMIT_TOKEN: SQUAD_ARCHIVE_SUBMIT_TOKEN {% endblock secrets %} {% endblock global_settings %} diff --git a/lava_test_plans/projects/lkft-android/variables.ini b/lava_test_plans/projects/lkft-android/variables.ini index b283ed83..5e64909f 100644 --- a/lava_test_plans/projects/lkft-android/variables.ini +++ b/lava_test_plans/projects/lkft-android/variables.ini @@ -42,7 +42,8 @@ DEPLOY_OS="android" DOCKER_IMAGE_TEST="docker-hub-url" # -ARTIFACTORIAL_TOKEN="artifactorial-token" +SQUAD_URL="squad-url" +SQUAD_ARCHIVE_SUBMIT_TOKEN="squad-archive-submit-token" # TEST_CTS_URL="test-cts-url" diff --git a/lava_test_plans/testcases/templates/android-benchmarks.yaml.jinja2 b/lava_test_plans/testcases/templates/android-benchmarks.yaml.jinja2 index 9c95e662..7db389bc 100644 --- a/lava_test_plans/testcases/templates/android-benchmarks.yaml.jinja2 +++ b/lava_test_plans/testcases/templates/android-benchmarks.yaml.jinja2 @@ -15,4 +15,8 @@ SET_GOVERNOR_POLICY: "{{set_governor_policy}}" TEST_NAME: {{benchmark_name}} LOOPS: {{loopcount}} +{% if SQUAD_URL is defined %} + SQUAD_UPLOAD_URL: "{{SQUAD_URL}}/{{device_type}}" +{% endif %} + {% endblock test_target %} diff --git a/lava_test_plans/testcases/templates/android-xts.yaml.jinja2 b/lava_test_plans/testcases/templates/android-xts.yaml.jinja2 index 19bf615a..96ed46f9 100644 --- a/lava_test_plans/testcases/templates/android-xts.yaml.jinja2 +++ b/lava_test_plans/testcases/templates/android-xts.yaml.jinja2 @@ -26,5 +26,8 @@ RESULTS_FORMAT: "{{xts_result_format}}" ANDROID_VERSION: "{{ANDROID_VERSION}}" TEST_REBOOT_EXPECTED: "{{xts_expect_reboot}}" +{% if SQUAD_URL is defined %} + SQUAD_UPLOAD_URL: "{{SQUAD_URL}}/{{device_type}}" +{% endif %} name: "{{test_name}}" {% endblock test_target %} diff --git a/test/variables-lkft-android-tuxsuite.ini b/test/variables-lkft-android-tuxsuite.ini index 53035c1e..c3203cf8 100644 --- a/test/variables-lkft-android-tuxsuite.ini +++ b/test/variables-lkft-android-tuxsuite.ini @@ -26,4 +26,5 @@ DEPLOY_OS="android" # DOCKER_IMAGE_TEST="docker-hub-url" # -ARTIFACTORIAL_TOKEN="artifactorial-token" +SQUAD_URL="squad-url" +SQUAD_ARCHIVE_SUBMIT_TOKEN="squad-archive-submit-token"