Merge branch 'feature/download_only_required_ut_bin' into 'master'

CI: Download only required bin for unit tests

Closes IDF-1608

See merge request espressif/esp-idf!9266

Author: igrr

examples/system/app_trace_to_host/example_test.py

@@ -6,7 +6,6 @@
 
 @ttfw_idf.idf_example_test(env_tag="test_jtag_arm")
 def test_examples_app_trace_to_host(env, extra_data):
-
     rel_project_path = os.path.join('examples', 'system', 'app_trace_to_host')
     dut = env.get_dut('app_trace_to_host', rel_project_path)
     idf_path = dut.app.get_sdk_path()
@@ -28,8 +27,7 @@ def test_examples_app_trace_to_host(env, extra_data):
 
     with ttfw_idf.CustomProcess(' '.join([os.path.join(idf_path, 'tools/esp_app_trace/logtrace_proc.py'),
                                           'adc.log',
-                                          os.path.join(dut.app.get_binary_path(rel_project_path),
-                                                       'app_trace_to_host.elf')]),
+                                          os.path.join(dut.app.binary_path, 'app_trace_to_host.elf')]),
                                 logfile='logtrace_proc.log') as logtrace:
         logtrace.pexpect_proc.expect_exact('Parse trace file')
         logtrace.pexpect_proc.expect_exact('Parsing completed.')

examples/system/sysview_tracing/example_test.py

@@ -13,9 +13,8 @@ def test_examples_sysview_tracing(env, extra_data):
 
     rel_project_path = os.path.join('examples', 'system', 'sysview_tracing')
     dut = env.get_dut('sysview_tracing', rel_project_path)
-    idf_path = dut.app.get_sdk_path()
-    proj_path = os.path.join(idf_path, rel_project_path)
-    elf_path = os.path.join(dut.app.get_binary_path(rel_project_path), 'sysview_tracing.elf')
+    proj_path = os.path.join(dut.app.idf_path, rel_project_path)
+    elf_path = os.path.join(dut.app.binary_path, 'sysview_tracing.elf')
 
     def get_temp_file():
         with tempfile.NamedTemporaryFile(delete=False) as f:

examples/system/sysview_tracing_heap_log/example_test.py

@@ -12,9 +12,8 @@ def test_examples_sysview_tracing_heap_log(env, extra_data):
 
     rel_project_path = os.path.join('examples', 'system', 'sysview_tracing_heap_log')
     dut = env.get_dut('sysview_tracing_heap_log', rel_project_path)
-    idf_path = dut.app.get_sdk_path()
-    proj_path = os.path.join(idf_path, rel_project_path)
-    elf_path = os.path.join(dut.app.get_binary_path(rel_project_path), 'sysview_tracing_heap_log.elf')
+    proj_path = os.path.join(dut.app.idf_path, rel_project_path)
+    elf_path = os.path.join(dut.app.binary_path, 'sysview_tracing_heap_log.elf')
 
     def get_temp_file():
         with tempfile.NamedTemporaryFile(delete=False) as f:
@@ -45,7 +44,7 @@ def get_temp_file():
                 # dut has been restarted by gdb since the last dut.expect()
                 dut.expect('esp_apptrace: Initialized TRAX on CPU0')
 
-        with ttfw_idf.CustomProcess(' '.join([os.path.join(idf_path, 'tools/esp_app_trace/sysviewtrace_proc.py'),
+        with ttfw_idf.CustomProcess(' '.join([os.path.join(dut.app.idf_path, 'tools/esp_app_trace/sysviewtrace_proc.py'),
                                               '-p',
                                               '-b', elf_path,
                                               tempfiles[1]]),

tools/ci/config/assign-test.yml

@@ -24,6 +24,7 @@ assign_test:
       - $TEST_APP_CONFIG_OUTPUT_PATH
       - build_examples/artifact_index.json
       - build_test_apps/artifact_index.json
+      - tools/unit-test-app/builds/artifact_index.json
     expire_in: 1 week
   only:
     variables:
@@ -35,11 +36,11 @@ assign_test:
       - $BOT_LABEL_CUSTOM_TEST
   script:
     # assign example tests
-    - python tools/ci/python_packages/ttfw_idf/CIAssignExampleTest.py $IDF_PATH/examples $CI_TARGET_TEST_CONFIG_FILE $EXAMPLE_CONFIG_OUTPUT_PATH
+    - python tools/ci/python_packages/ttfw_idf/IDFAssignTest.py example_test $IDF_PATH/examples $CI_TARGET_TEST_CONFIG_FILE $EXAMPLE_CONFIG_OUTPUT_PATH
     # assign test apps
-    - python tools/ci/python_packages/ttfw_idf/CIAssignExampleTest.py --custom-group test-apps --job-prefix test_app_test_ $IDF_PATH/tools/test_apps $CI_TARGET_TEST_CONFIG_FILE $TEST_APP_CONFIG_OUTPUT_PATH
+    - python tools/ci/python_packages/ttfw_idf/IDFAssignTest.py custom_test  $IDF_PATH/tools/test_apps $CI_TARGET_TEST_CONFIG_FILE $TEST_APP_CONFIG_OUTPUT_PATH
     # assign unit test cases
-    - python tools/ci/python_packages/ttfw_idf/CIAssignUnitTest.py $UNIT_TEST_CASE_FILE $CI_TARGET_TEST_CONFIG_FILE $IDF_PATH/components/idf_test/unit_test/CIConfigs
+    - python tools/ci/python_packages/ttfw_idf/IDFAssignTest.py unit_test $UNIT_TEST_CASE_FILE $CI_TARGET_TEST_CONFIG_FILE $IDF_PATH/components/idf_test/unit_test/CIConfigs
     # clone test script to assign tests
     - ./tools/ci/retry_failed.sh git clone $TEST_SCRIPT_REPOSITORY
     - python $CHECKOUT_REF_SCRIPT auto_test_script auto_test_script

tools/ci/config/build.yml

@@ -45,7 +45,7 @@ build_ssc_esp32s2:
   artifacts:
     paths:
       - tools/unit-test-app/output/${IDF_TARGET}
-      - tools/unit-test-app/builds/${IDF_TARGET}/*.json
+      - tools/unit-test-app/builds/*.json
       - tools/unit-test-app/builds/${IDF_TARGET}/*/size.json
       - components/idf_test/unit_test/*.yml
       - $LOG_PATH

tools/ci/config/target-test.yml

@@ -109,7 +109,6 @@
   stage: target_test
   dependencies:
     - assign_test
-    - build_esp_idf_tests_cmake_esp32
   only:
     refs:
       - master
@@ -546,7 +545,6 @@ UT_034:
   extends: .unit_test_template
   dependencies:
     - assign_test
-    - build_esp_idf_tests_cmake_esp32s2
   only:
     refs:
       # Due to lack of runners, the tests are only done by manual trigger

tools/ci/find_apps_build_apps.sh

@@ -169,4 +169,7 @@ if [ "${TEST_TYPE}" = "unit_test" ]; then
     mkdir -p ${dst}/partition_table
     cp ${src}/partition_table/*.bin ${dst}/partition_table/
   done
+
+  # Copy app list json files to build path
+  mv ${BUILD_PATH}/${IDF_TARGET}/*.json ${BUILD_PATH}
 fi

tools/ci/python_packages/gitlab_api.py

@@ -109,7 +109,7 @@ def download_artifact(self, job_id, artifact_path, destination=None):
             try:
                 data = job.artifact(a_path)
             except gitlab.GitlabGetError as e:
-                print("Failed to download '{}' form job {}".format(a_path, job_id))
+                print("Failed to download '{}' from job {}".format(a_path, job_id))
                 raise e
             raw_data_list.append(data)
             if destination:

tools/ci/python_packages/ttfw_idf/CIAssignExampleTest.py

@@ -3,12 +3,11 @@
 import json
 import logging
 import os
-import re
 from collections import defaultdict
 
 from find_apps import find_apps
 from find_build_apps import BUILD_SYSTEMS, BUILD_SYSTEM_CMAKE
-from ttfw_idf.CIAssignExampleTest import CIExampleAssignTest, TestAppsGroup, ExampleGroup
+from ttfw_idf.IDFAssignTest import ExampleAssignTest, TestAppsAssignTest
 
 VALID_TARGETS = [
     'esp32',
@@ -98,10 +97,9 @@ def main():
     test_cases = []
     for path in set(args.paths):
         if args.test_type == 'example_test':
-            assign = CIExampleAssignTest(path, args.ci_config_file, ExampleGroup)
+            assign = ExampleAssignTest(path, args.ci_config_file)
         elif args.test_type == 'test_apps':
-            CIExampleAssignTest.CI_TEST_JOB_PATTERN = re.compile(r'^test_app_test_.+')
-            assign = CIExampleAssignTest(path, args.ci_config_file, TestAppsGroup)
+            assign = TestAppsAssignTest(path, args.ci_config_file)
         else:
             raise SystemExit(1)  # which is impossible