diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml index 24a33273d6..ef6cf2a466 100644 --- a/.gitlab/ci/dependencies/dependencies.yml +++ b/.gitlab/ci/dependencies/dependencies.yml @@ -136,12 +136,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 04dce56a27..d746ca5214 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -747,7 +747,6 @@ .rules:labels:fuzzer_test-weekend_test: rules: - - <<: *if-protected - <<: *if-label-fuzzer_test - <<: *if-title-fuzzer_test - <<: *if-label-weekend_test @@ -755,19 +754,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 @@ -804,16 +800,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 @@ -824,8 +814,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