From c49a72b499e30ecef04226480eeea8b735584673 Mon Sep 17 00:00:00 2001
From: Fu Hanxi <fuhanxi@espressif.com>
Date: Sat, 20 Feb 2021 10:41:54 +0800
Subject: [PATCH] ci: run rules:labels job only with labels

---
 .gitlab/ci/dependencies/dependencies.yml  |  4 ----
 .gitlab/ci/dependencies/generate_rules.py |  2 +-
 .gitlab/ci/rules.yml                      | 12 ------------
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml
index 0a1a48dcda..b9c4cd631f 100644
--- a/.gitlab/ci/dependencies/dependencies.yml
+++ b/.gitlab/ci/dependencies/dependencies.yml
@@ -131,12 +131,8 @@
     - [weekend_test, iperf_stress_test, nvs_coverage]
   labels:
     - "{0}"
-  included_in:
-    - test:any_test
 
 "labels:fuzzer_test-weekend_test":
   labels:
     - fuzzer_test
     - weekend_test
-  included_in:
-    - test:any_test
diff --git a/.gitlab/ci/dependencies/generate_rules.py b/.gitlab/ci/dependencies/generate_rules.py
index f14099006c..469799f209 100755
--- a/.gitlab/ci/dependencies/generate_rules.py
+++ b/.gitlab/ci/dependencies/generate_rules.py
@@ -215,7 +215,7 @@ class RulesWriter:
         if name.endswith('-production'):
             _rules.append(self.RULE_PROD)
         else:
-            if not name.endswith('-preview'):
+            if not (name.endswith('-preview') or name.startswith('labels:')):
                 _rules.append(self.RULE_NORM)
             for label in cfg['labels']:
                 _rules.append(self.RULE_LABEL_TEMPLATE.format(label))
diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
index aacc79e126..0c266b3ab0 100644
--- a/.gitlab/ci/rules.yml
+++ b/.gitlab/ci/rules.yml
@@ -745,7 +745,6 @@
 
 .rules:labels:fuzzer_test-weekend_test:
   rules:
-    - <<: *if-protected
     - <<: *if-label-fuzzer_test
     - <<: *if-title-fuzzer_test
     - <<: *if-label-weekend_test
@@ -753,19 +752,16 @@
 
 .rules:labels:iperf_stress_test:
   rules:
-    - <<: *if-protected
     - <<: *if-label-iperf_stress_test
     - <<: *if-title-iperf_stress_test
 
 .rules:labels:nvs_coverage:
   rules:
-    - <<: *if-protected
     - <<: *if-label-nvs_coverage
     - <<: *if-title-nvs_coverage
 
 .rules:labels:weekend_test:
   rules:
-    - <<: *if-protected
     - <<: *if-label-weekend_test
     - <<: *if-title-weekend_test
 
@@ -802,16 +798,10 @@
     - <<: *if-title-example_test_esp32s2
     - <<: *if-label-example_test_esp32s3
     - <<: *if-title-example_test_esp32s3
-    - <<: *if-label-fuzzer_test
-    - <<: *if-title-fuzzer_test
     - <<: *if-label-host_test
     - <<: *if-title-host_test
     - <<: *if-label-integration_test
     - <<: *if-title-integration_test
-    - <<: *if-label-iperf_stress_test
-    - <<: *if-title-iperf_stress_test
-    - <<: *if-label-nvs_coverage
-    - <<: *if-title-nvs_coverage
     - <<: *if-label-unit_test
     - <<: *if-title-unit_test
     - <<: *if-label-unit_test_esp32
@@ -822,8 +812,6 @@
     - <<: *if-title-unit_test_esp32s2
     - <<: *if-label-unit_test_esp32s3
     - <<: *if-title-unit_test_esp32s3
-    - <<: *if-label-weekend_test
-    - <<: *if-title-weekend_test
     - <<: *if-dev-push
       changes: *patterns-build
     - <<: *if-dev-push