From ac7e51903ab00a1fcccc01ad0a52c885ac8bacdc Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Wed, 24 May 2023 09:18:07 +0800 Subject: [PATCH] ci: remove unused jobs and patterns --- .gitlab/ci/assign-test.yml | 30 ------------- .gitlab/ci/dependencies/dependencies.yml | 8 ---- .gitlab/ci/rules.yml | 55 ------------------------ .gitlab/ci/target-test.yml | 41 ++---------------- 4 files changed, 3 insertions(+), 131 deletions(-) diff --git a/.gitlab/ci/assign-test.yml b/.gitlab/ci/assign-test.yml index d470655708..663d084e57 100644 --- a/.gitlab/ci/assign-test.yml +++ b/.gitlab/ci/assign-test.yml @@ -14,36 +14,6 @@ script: - run_cmd python tools/ci/python_packages/ttfw_idf/IDFAssignTest.py $TEST_TYPE $TEST_DIR -c $CI_TARGET_TEST_CONFIG_FILE -o $TEST_DIR/test_configs -assign_example_test: - extends: - - .assign_test_template - - .rules:build:example_test - needs: - - job: build_examples_cmake_esp32 - artifacts: false - optional: true - - job: build_examples_cmake_esp32s2 - artifacts: false - optional: true - - job: build_examples_cmake_esp32c2 - artifacts: false - optional: true - - job: build_examples_cmake_esp32c3 - artifacts: false - optional: true - - job: build_examples_cmake_esp32c6 - artifacts: false - optional: true - - job: build_examples_cmake_esp32h2 - artifacts: false - optional: true - - job: build_examples_cmake_esp32s3 - artifacts: false - optional: true - variables: - TEST_TYPE: example_test - TEST_DIR: examples - assign_unit_test: extends: - .assign_test_template diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml index 7b12825373..4aba4857bd 100644 --- a/.gitlab/ci/dependencies/dependencies.yml +++ b/.gitlab/ci/dependencies/dependencies.yml @@ -39,14 +39,6 @@ - build_system - downloadable-tools -"build:windows": - labels: - - build - - windows - patterns: - - build_system - - windows - "build:macos": labels: - build diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index d877e7c964..154e2013ed 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -166,9 +166,6 @@ - "tools/split_paths_by_spaces.py" -.patterns-windows: &patterns-windows - - "tools/windows/**/*" - .patterns-docker: &patterns-docker - "tools/docker/**/*" @@ -587,9 +584,6 @@ .if-label-unit_test_esp32s3: &if-label-unit_test_esp32s3 if: '$BOT_LABEL_UNIT_TEST_ESP32S3 || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*unit_test_esp32s3(?:,[^,\n\r]+)*$/i' -.if-label-windows: &if-label-windows - if: '$BOT_LABEL_WINDOWS || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*windows(?:,[^,\n\r]+)*$/i' - .rules:build: rules: - <<: *if-revert-branch @@ -1135,55 +1129,6 @@ - <<: *if-dev-push changes: *patterns-submodule -.rules:build:example_test: - rules: - - <<: *if-revert-branch - when: never - - <<: *if-protected - - <<: *if-example_test-ota-include_nightly_run-rule - - <<: *if-label-build - - <<: *if-label-example_test - - <<: *if-label-example_test_esp32 - - <<: *if-label-example_test_esp32c2 - - <<: *if-label-example_test_esp32c3 - - <<: *if-label-example_test_esp32c6 - - <<: *if-label-example_test_esp32h2 - - <<: *if-label-example_test_esp32s2 - - <<: *if-label-example_test_esp32s3 - - <<: *if-label-target_test - - <<: *if-dev-push - changes: *patterns-build-example_test - - <<: *if-dev-push - changes: *patterns-build_components - - <<: *if-dev-push - changes: *patterns-build_system - - <<: *if-dev-push - changes: *patterns-downloadable-tools - - <<: *if-dev-push - changes: *patterns-example_test - - <<: *if-dev-push - changes: *patterns-example_test-bt - - <<: *if-dev-push - changes: *patterns-example_test-ethernet - - <<: *if-dev-push - changes: *patterns-example_test-i154 - - <<: *if-dev-push - changes: *patterns-example_test-nvs_encr_hmac - - <<: *if-dev-push - changes: *patterns-example_test-sdio - - <<: *if-dev-push - changes: *patterns-example_test-usb - - <<: *if-dev-push - changes: *patterns-example_test-wifi - - <<: *if-dev-push - changes: *patterns-target_test-adc - - <<: *if-dev-push - changes: *patterns-target_test-ecdsa - - <<: *if-dev-push - changes: *patterns-target_test-i154 - - <<: *if-dev-push - changes: *patterns-target_test-wifi - .rules:build:example_test-esp32: rules: - <<: *if-revert-branch diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml index d9c202ddb9..2499d1d257 100644 --- a/.gitlab/ci/target-test.yml +++ b/.gitlab/ci/target-test.yml @@ -1133,36 +1133,6 @@ pytest_test_apps_esp32s3_mspi_f4r4: - cd tools/ci/python_packages/tiny_test_fw/bin - run_cmd python Runner.py $TEST_CASE_PATH -c $CONFIG_FILE -e $ENV_FILE --known_failure_cases_file $CI_PROJECT_DIR/known_failure_cases/known_failure_cases.txt -.example_test_template: - extends: .target_test_job_template - needs: - - assign_example_test - variables: - TEST_CASE_PATH: "$CI_PROJECT_DIR/examples" - CONFIG_FILE_PATH: "${CI_PROJECT_DIR}/examples/test_configs" - -.example_test_esp32_template: - extends: - - .example_test_template - - .rules:test:example_test-esp32 - -.example_test_esp32c3_template: - extends: - - .example_test_template - - .rules:test:example_test-esp32c3 - -example_test_001C: - extends: .example_test_esp32_template - tags: - - ESP32 - - Example_GENERIC - -example_test_C3_GENERIC: - extends: .example_test_esp32c3_template - tags: - - ESP32C3 - - Example_GENERIC - .unit_test_template: extends: .target_test_job_template needs: # the assign already needs all the build jobs @@ -1209,7 +1179,7 @@ example_test_C3_GENERIC: UT_001: extends: .unit_test_esp32_template - parallel: 16 + parallel: 2 tags: - ESP32_IDF - UT_T1_1 @@ -1218,7 +1188,6 @@ UT_001: UT_002: extends: .unit_test_esp32_template - parallel: 7 tags: - ESP32_IDF - UT_T1_1 @@ -1265,7 +1234,7 @@ UT_028: UT_035: extends: .unit_test_esp32s2_template - parallel: 16 + parallel: 2 tags: - ESP32S2_IDF - UT_T1_1 @@ -1280,7 +1249,6 @@ UT_S2_SDSPI: UT_C2: extends: .unit_test_esp32c2_template - parallel: 8 tags: - ESP32C2_IDF - UT_T1_1 @@ -1288,7 +1256,6 @@ UT_C2: UT_C3: extends: .unit_test_esp32c3_template - parallel: 11 tags: - ESP32C3_IDF - UT_T1_1 @@ -1303,21 +1270,19 @@ UT_C3_SDSPI: UT_C6: extends: .unit_test_esp32c6_template - parallel: 8 tags: - ESP32C6_IDF - UT_T1_1 UT_H2: extends: .unit_test_esp32h2_template - parallel: 5 tags: - ESP32H2_IDF - UT_T1_1 UT_S3: extends: .unit_test_esp32s3_template - parallel: 9 + parallel: 2 tags: - ESP32S3_IDF - UT_T1_1