From 6fd2d27bfd302be3844eee2d40b4087f91d3393f Mon Sep 17 00:00:00 2001
From: Fu Hanxi <fuhanxi@espressif.com>
Date: Mon, 30 Nov 2020 11:44:37 +0800
Subject: [PATCH] Make sure "unit_test" will trigger all labels

- keep labels name consist with the bot variable
---
 tools/ci/config/rules.yml       | 31 ++++++++++++++++++-------------
 tools/ci/config/target-test.yml |  6 ++----
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/tools/ci/config/rules.yml b/tools/ci/config/rules.yml
index b4dad123fd..9f4370b2ac 100644
--- a/tools/ci/config/rules.yml
+++ b/tools/ci/config/rules.yml
@@ -32,14 +32,17 @@
 .if-label-integration_test: &if-label-integration_test
   if: '$BOT_LABEL_INTEGRATION_TEST'
 
-.if-label-unit_test-32_only: &if-label-unit_test-32_only
+.if-label-unit_test: &if-label-unit_test
+  if: '$BOT_LABEL_UNIT_TEST'
+
+.if-label-unit_test-32: &if-label-unit_test-32
   if: '$BOT_LABEL_UNIT_TEST_32'
 
-.if-label-unit_test-s2_only: &if-label-unit_test-s2_only
+.if-label-unit_test-s2: &if-label-unit_test-s2
   if: '$BOT_LABEL_UNIT_TEST_S2'
 
-.if-label-unit_test-all_targets: &if-label-unit_test-all_targets
-  if: '$BOT_LABEL_UNIT_TEST'
+.if-label-unit_test-all_labels: &if-label-unit_test-all_labels
+  if: '$BOT_LABEL_UNIT_TEST || $BOT_LABEL_UNIT_TEST_32 || $BOT_LABEL_UNIT_TEST_S2'
 
 .if-label-weekend_test: &if-label-weekend_test
   if: '$BOT_LABEL_WEEKEND_TEST'
@@ -176,17 +179,19 @@
 .rules:tests:unit_test:
   rules:
     - <<: *if-protected-no_label
-    - <<: *if-label-unit_test-all_targets
+    - <<: *if-label-unit_test-all_labels
 
-.rules:tests:unit_test_32-only:
+.rules:tests:unit_test_32:
   rules:
     - <<: *if-protected-no_label
-    - <<: *if-label-unit_test-32_only
+    - <<: *if-label-unit_test
+    - <<: *if-label-unit_test-32
 
-.rules:tests:unit_test_s2-only:
+.rules:tests:unit_test_s2:
   rules:
     - <<: *if-protected-no_label
-    - <<: *if-label-unit_test-s2_only
+    - <<: *if-label-unit_test
+    - <<: *if-label-unit_test-s2
 
 .rules:tests:integration_test:
   rules:
@@ -199,7 +204,7 @@
     - <<: *if-label-regular_test
     - <<: *if-label-example_test
     - <<: *if-label-custom_test
-    - <<: *if-label-unit_test-all_targets
+    - <<: *if-label-unit_test-all_labels
     - <<: *if-label-integration_test
     - <<: *if-label-weekend_test
 
@@ -222,7 +227,7 @@
     - <<: *if-protected-no_label
     - <<: *if-label-build
     - <<: *if-label-regular_test
-    - <<: *if-label-unit_test-all_targets
+    - <<: *if-label-unit_test-all_labels
 
 .rules:build_tests:example_test-weekend_test:
   rules:
@@ -247,7 +252,7 @@
     - <<: *if-label-regular_test
     - <<: *if-label-example_test
     - <<: *if-label-custom_test
-    - <<: *if-label-unit_test-all_targets
+    - <<: *if-label-unit_test-all_labels
 
 .rules:build_tests:target_test-weekend_test:
   rules:
@@ -256,5 +261,5 @@
     - <<: *if-label-regular_test
     - <<: *if-label-example_test
     - <<: *if-label-custom_test
-    - <<: *if-label-unit_test-all_targets
+    - <<: *if-label-unit_test-all_labels
     - <<: *if-label-weekend_test
diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml
index 7af34fa0f3..4aa2aaf4df 100644
--- a/tools/ci/config/target-test.yml
+++ b/tools/ci/config/target-test.yml
@@ -83,14 +83,12 @@
 .unit_test_32_template:
   extends:
     - .unit_test_template
-    - .rules:tests:unit_test_32-only
-    - .rules:tests:unit_test
+    - .rules:tests:unit_test_32
 
 .unit_test_s2_template:
   extends:
     - .unit_test_template
-    - .rules:tests:unit_test_s2-only
-    - .rules:tests:unit_test
+    - .rules:tests:unit_test_s2
 
 .integration_test_template:
   extends: