Merge branch 'ci/fix_advanced_ota_sdkconfig' into 'master'

CI: fix sdkconfig in advanced https ota example

Closes IDFCI-1369 and IDFCI-1370

See merge request espressif/esp-idf!19078

.gitlab/ci/dependencies/dependencies.yml

@@ -156,40 +156,41 @@ build:integration_test:
     - "build:component_ut-{0}"
     - build:target_test
 
-# To reduce the runner usage.
-# Do not create these jobs by default labels on development branches
-# Only triggered by `target_test` or related_changes changes
-"test:example_test-{0}-{1}-related_changes":
+# To reduce the specific runners' usage.
+# Do not create these jobs by default patterns on development branches
+# Can be triggered by labels or related changes
+"test:example_test-{0}-{1}":
   matrix:
     - *all_targets
-    - - ota
-      - bt
-      - wifi
+    - - bt        # example_test_005
+      - wifi      # example_test_002, example_test*wifi*
+      - ethernet  # example_test*ethernet*
   patterns:
-    - "example_test-related_changes-{1}"
+    - "example_test-{0}-{1}"
+    - "example_test-{1}"
   labels:
+    - "example_test_{0}"
+    - example_test
     - target_test
   included_in:
     - "build:example_test-{0}"
     - "build:example_test"
     - build:target_test
 
-# Include nightly_run cases for ota
-"test:example_test-{0}-ota-related_changes-include_nightly_run":
+# For example_test*flash_encryption_wifi_high_traffic jobs
+# set `INCLUDE_NIGHTLY_RUN` variable when triggered on development branches
+"test:example_test-{0}-include_nightly_run-rule":
   matrix:
     - - esp32
       - esp32c3
   specific_rules:
     - "if-include_nightly_run-rule"
-    - "if-example_test-related_changes-ota-rule"
-  labels:
-    - target_test
+    - "if-example_test-ota-include_nightly_run-rule"
   included_in:
     - "build:example_test-{0}"
     - "build:example_test"
     - build:target_test
 
-
 # due to the lack of runners, c2 tests will only be triggered by label
 "test:{0}-esp32c2":
   matrix:

.gitlab/ci/rules.yml

@@ -175,20 +175,43 @@
   - "examples/peripherals/secure_element/atecc608_ecdsa/components/esp-cryptoauthlib"
   - ".gitmodules"
 
-.patterns-example_test-related_changes-ota: &patterns-example_test-related_changes-ota
+.patterns-example_test-ota-nightly_run: &patterns-example_test-ota-nightly_run
   - "examples/system/ota/**/*"
   - "examples/common_components/protocol_examples_common/**/*"
   - "components/app_update/**/*"
+  - "components/esp_https_ota/**/*"
 
-.patterns-example_test-related_changes-bt: &patterns-example_test-related_changes-bt
+.patterns-example_test-bt: &patterns-example_test-bt
   - "components/bt/host/nimble/nimble"
   - "examples/bluetooth/nimble/**/*"
 
-.patterns-example_test-related_changes-wifi: &patterns-example_test-related_changes-wifi
-  - "components/esp_wifi/lib"
-  - "components/lwip/**/*"
+# patterns for example test jobs with runner label `ethernet*`
+.patterns-example_test-ethernet: &patterns-example_test-ethernet
+  - "tools/ci/python_packages/common_test_methods.py"
+  - "examples/common_components/**/*"
+  - "examples/protocols/**/*"
+  - "examples/system/ota/**/*"
+
+  - "components/esp_eth/**/*"
+
+# patterns for example test jobs with runner label `wifi*`
+.patterns-example_test-wifi: &patterns-example_test-wifi
+  - "tools/ci/python_packages/common_test_methods.py"
+  - "examples/common_components/protocol_examples_common/**/*"
   - "examples/protocols/**/*"
   - "examples/wifi/**/*"
+  - "examples/network/simple_sniffer/**/*"
+
+  - "components/esp_phy/**/*"
+  - "components/esp_wifi/**/*"
+  - "components/esp_netif/**/*"
+  - "components/lwip/**/*"
+
+  # for cases with wifi_high_traffic marker
+  - "examples/system/ota/**/*"
+  - "components/app_update/**/*"
+  - "components/esp_https_ota/**/*"
+
 
 ##############
 # if anchors #
@@ -224,14 +247,15 @@
 # Specific if rules #
 #####################
 
+# Inlcude nightly run cases by labels `include_nightly_run` or `target_test`
 .if-include_nightly_run-rule: &if-include_nightly_run-rule
   if: '$INCLUDE_NIGHTLY_RUN || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*include_nightly_run(?:,[^,\n\r]+)*$/i || $CI_MERGE_REQUEST_LABELS =~ /^(?:[^,\n\r]+,)*target_test(?:,[^,\n\r]+)*$/i'
   variables:
     INCLUDE_NIGHTLY_RUN: "1"
 
-.if-example_test-related_changes-ota-rule: &if-example_test-related_changes-ota-rule
+.if-example_test-ota-include_nightly_run-rule: &if-example_test-ota-include_nightly_run-rule
   <<: *if-dev-push
-  changes: *patterns-example_test-related_changes-ota
+  changes: *patterns-example_test-ota-nightly_run
   variables:
     INCLUDE_NIGHTLY_RUN: "1"
 
@@ -712,7 +736,7 @@
     - <<: *if-revert-branch
       when: never
     - <<: *if-protected
-    - <<: *if-example_test-related_changes-ota-rule
+    - <<: *if-example_test-ota-include_nightly_run-rule
     - <<: *if-include_nightly_run-rule
     - <<: *if-label-build
     - <<: *if-label-example_test
@@ -733,18 +757,18 @@
     - <<: *if-dev-push
       changes: *patterns-example_test
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-bt
+      changes: *patterns-example_test-bt
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-ota
+      changes: *patterns-example_test-ethernet
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-wifi
+      changes: *patterns-example_test-wifi
 
 .rules:build:example_test-esp32:
   rules:
     - <<: *if-revert-branch
       when: never
     - <<: *if-protected
-    - <<: *if-example_test-related_changes-ota-rule
+    - <<: *if-example_test-ota-include_nightly_run-rule
     - <<: *if-include_nightly_run-rule
     - <<: *if-label-build
     - <<: *if-label-example_test
@@ -760,11 +784,11 @@
     - <<: *if-dev-push
       changes: *patterns-example_test
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-bt
+      changes: *patterns-example_test-bt
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-ota
+      changes: *patterns-example_test-ethernet
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-wifi
+      changes: *patterns-example_test-wifi
 
 .rules:build:example_test-esp32c2:
   rules:
@@ -772,6 +796,7 @@
       when: never
     - <<: *if-protected
     - <<: *if-label-build
+    - <<: *if-label-example_test
     - <<: *if-label-example_test_esp32c2
     - <<: *if-label-target_test
     - <<: *if-dev-push
@@ -779,18 +804,18 @@
     - <<: *if-dev-push
       changes: *patterns-build_system
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-bt
+      changes: *patterns-example_test-bt
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-ota
+      changes: *patterns-example_test-ethernet
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-wifi
+      changes: *patterns-example_test-wifi
 
 .rules:build:example_test-esp32c3:
   rules:
     - <<: *if-revert-branch
       when: never
     - <<: *if-protected
-    - <<: *if-example_test-related_changes-ota-rule
+    - <<: *if-example_test-ota-include_nightly_run-rule
     - <<: *if-include_nightly_run-rule
     - <<: *if-label-build
     - <<: *if-label-example_test
@@ -805,11 +830,11 @@
     - <<: *if-dev-push
       changes: *patterns-example_test
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-bt
+      changes: *patterns-example_test-bt
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-ota
+      changes: *patterns-example_test-ethernet
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-wifi
+      changes: *patterns-example_test-wifi
 
 .rules:build:example_test-esp32h2:
   rules:
@@ -829,11 +854,11 @@
     - <<: *if-dev-push
       changes: *patterns-example_test
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-bt
+      changes: *patterns-example_test-bt
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-ota
+      changes: *patterns-example_test-ethernet
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-wifi
+      changes: *patterns-example_test-wifi
 
 .rules:build:example_test-esp32s2:
   rules:
@@ -853,11 +878,11 @@
     - <<: *if-dev-push
       changes: *patterns-example_test
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-bt
+      changes: *patterns-example_test-bt
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-ota
+      changes: *patterns-example_test-ethernet
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-wifi
+      changes: *patterns-example_test-wifi
 
 .rules:build:example_test-esp32s3:
   rules:
@@ -877,11 +902,11 @@
     - <<: *if-dev-push
       changes: *patterns-example_test
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-bt
+      changes: *patterns-example_test-bt
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-ota
+      changes: *patterns-example_test-ethernet
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-wifi
+      changes: *patterns-example_test-wifi
 
 .rules:build:integration_test:
   rules:
@@ -914,7 +939,7 @@
     - <<: *if-revert-branch
       when: never
     - <<: *if-protected
-    - <<: *if-example_test-related_changes-ota-rule
+    - <<: *if-example_test-ota-include_nightly_run-rule
     - <<: *if-include_nightly_run-rule
     - <<: *if-label-build
     - <<: *if-label-component_ut
@@ -963,11 +988,11 @@
     - <<: *if-dev-push
       changes: *patterns-example_test
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-bt
+      changes: *patterns-example_test-bt
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-ota
+      changes: *patterns-example_test-ethernet
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-wifi
+      changes: *patterns-example_test-wifi
     - <<: *if-dev-push
       changes: *patterns-integration_test
     - <<: *if-dev-push
@@ -1297,49 +1322,54 @@
     - <<: *if-dev-push
       changes: *patterns-example_test
 
-.rules:test:example_test-esp32-bt-related_changes:
+.rules:test:example_test-esp32-bt:
   rules:
     - <<: *if-revert-branch
       when: never
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-example_test
+    - <<: *if-label-example_test_esp32
     - <<: *if-label-target_test
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-bt
+      changes: *patterns-example_test-bt
 
-.rules:test:example_test-esp32-ota-related_changes:
+.rules:test:example_test-esp32-ethernet:
   rules:
     - <<: *if-revert-branch
       when: never
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-example_test
+    - <<: *if-label-example_test_esp32
     - <<: *if-label-target_test
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-ota
+      changes: *patterns-example_test-ethernet
 
-.rules:test:example_test-esp32-ota-related_changes-include_nightly_run:
+.rules:test:example_test-esp32-include_nightly_run-rule:
   rules:
     - <<: *if-revert-branch
       when: never
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
-    - <<: *if-example_test-related_changes-ota-rule
+    - <<: *if-example_test-ota-include_nightly_run-rule
     - <<: *if-include_nightly_run-rule
-    - <<: *if-label-target_test
 
-.rules:test:example_test-esp32-wifi-related_changes:
+.rules:test:example_test-esp32-wifi:
   rules:
     - <<: *if-revert-branch
       when: never
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-example_test
+    - <<: *if-label-example_test_esp32
     - <<: *if-label-target_test
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-wifi
+      changes: *patterns-example_test-wifi
 
 .rules:test:example_test-esp32c2:
   rules:
@@ -1350,38 +1380,44 @@
       when: never
     - <<: *if-label-example_test_esp32c2
 
-.rules:test:example_test-esp32c2-bt-related_changes:
+.rules:test:example_test-esp32c2-bt:
   rules:
     - <<: *if-revert-branch
       when: never
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-example_test
+    - <<: *if-label-example_test_esp32c2
     - <<: *if-label-target_test
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-bt
+      changes: *patterns-example_test-bt
 
-.rules:test:example_test-esp32c2-ota-related_changes:
+.rules:test:example_test-esp32c2-ethernet:
   rules:
     - <<: *if-revert-branch
       when: never
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-example_test
+    - <<: *if-label-example_test_esp32c2
     - <<: *if-label-target_test
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-ota
+      changes: *patterns-example_test-ethernet
 
-.rules:test:example_test-esp32c2-wifi-related_changes:
+.rules:test:example_test-esp32c2-wifi:
   rules:
     - <<: *if-revert-branch
       when: never
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-example_test
+    - <<: *if-label-example_test_esp32c2
     - <<: *if-label-target_test
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-wifi
+      changes: *patterns-example_test-wifi
 
 .rules:test:example_test-esp32c3:
   rules:
@@ -1398,49 +1434,54 @@
     - <<: *if-dev-push
       changes: *patterns-example_test
 
-.rules:test:example_test-esp32c3-bt-related_changes:
+.rules:test:example_test-esp32c3-bt:
   rules:
     - <<: *if-revert-branch
       when: never
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-example_test
+    - <<: *if-label-example_test_esp32c3
     - <<: *if-label-target_test
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-bt
+      changes: *patterns-example_test-bt
 
-.rules:test:example_test-esp32c3-ota-related_changes:
+.rules:test:example_test-esp32c3-ethernet:
   rules:
     - <<: *if-revert-branch
       when: never
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-example_test
+    - <<: *if-label-example_test_esp32c3
     - <<: *if-label-target_test
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-ota
+      changes: *patterns-example_test-ethernet
 
-.rules:test:example_test-esp32c3-ota-related_changes-include_nightly_run:
+.rules:test:example_test-esp32c3-include_nightly_run-rule:
   rules:
     - <<: *if-revert-branch
       when: never
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
-    - <<: *if-example_test-related_changes-ota-rule
+    - <<: *if-example_test-ota-include_nightly_run-rule
     - <<: *if-include_nightly_run-rule
-    - <<: *if-label-target_test
 
-.rules:test:example_test-esp32c3-wifi-related_changes:
+.rules:test:example_test-esp32c3-wifi:
   rules:
     - <<: *if-revert-branch
       when: never
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-example_test
+    - <<: *if-label-example_test_esp32c3
     - <<: *if-label-target_test
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-wifi
+      changes: *patterns-example_test-wifi
 
 .rules:test:example_test-esp32h2:
   rules:
@@ -1457,38 +1498,44 @@
     - <<: *if-dev-push
       changes: *patterns-example_test
 
-.rules:test:example_test-esp32h2-bt-related_changes:
+.rules:test:example_test-esp32h2-bt:
   rules:
     - <<: *if-revert-branch
       when: never
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-example_test
+    - <<: *if-label-example_test_esp32h2
     - <<: *if-label-target_test
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-bt
+      changes: *patterns-example_test-bt
 
-.rules:test:example_test-esp32h2-ota-related_changes:
+.rules:test:example_test-esp32h2-ethernet:
   rules:
     - <<: *if-revert-branch
       when: never
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-example_test
+    - <<: *if-label-example_test_esp32h2
     - <<: *if-label-target_test
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-ota
+      changes: *patterns-example_test-ethernet
 
-.rules:test:example_test-esp32h2-wifi-related_changes:
+.rules:test:example_test-esp32h2-wifi:
   rules:
     - <<: *if-revert-branch
       when: never
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-example_test
+    - <<: *if-label-example_test_esp32h2
     - <<: *if-label-target_test
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-wifi
+      changes: *patterns-example_test-wifi
 
 .rules:test:example_test-esp32s2:
   rules:
@@ -1505,38 +1552,44 @@
     - <<: *if-dev-push
       changes: *patterns-example_test
 
-.rules:test:example_test-esp32s2-bt-related_changes:
+.rules:test:example_test-esp32s2-bt:
   rules:
     - <<: *if-revert-branch
       when: never
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-example_test
+    - <<: *if-label-example_test_esp32s2
     - <<: *if-label-target_test
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-bt
+      changes: *patterns-example_test-bt
 
-.rules:test:example_test-esp32s2-ota-related_changes:
+.rules:test:example_test-esp32s2-ethernet:
   rules:
     - <<: *if-revert-branch
       when: never
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-example_test
+    - <<: *if-label-example_test_esp32s2
     - <<: *if-label-target_test
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-ota
+      changes: *patterns-example_test-ethernet
 
-.rules:test:example_test-esp32s2-wifi-related_changes:
+.rules:test:example_test-esp32s2-wifi:
   rules:
     - <<: *if-revert-branch
       when: never
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-example_test
+    - <<: *if-label-example_test_esp32s2
     - <<: *if-label-target_test
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-wifi
+      changes: *patterns-example_test-wifi
 
 .rules:test:example_test-esp32s3:
   rules:
@@ -1547,38 +1600,44 @@
       when: never
     - <<: *if-label-example_test_esp32s3
 
-.rules:test:example_test-esp32s3-bt-related_changes:
+.rules:test:example_test-esp32s3-bt:
   rules:
     - <<: *if-revert-branch
       when: never
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-example_test
+    - <<: *if-label-example_test_esp32s3
     - <<: *if-label-target_test
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-bt
+      changes: *patterns-example_test-bt
 
-.rules:test:example_test-esp32s3-ota-related_changes:
+.rules:test:example_test-esp32s3-ethernet:
   rules:
     - <<: *if-revert-branch
       when: never
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-example_test
+    - <<: *if-label-example_test_esp32s3
     - <<: *if-label-target_test
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-ota
+      changes: *patterns-example_test-ethernet
 
-.rules:test:example_test-esp32s3-wifi-related_changes:
+.rules:test:example_test-esp32s3-wifi:
   rules:
     - <<: *if-revert-branch
       when: never
     - <<: *if-protected
     - <<: *if-label-build-only
       when: never
+    - <<: *if-label-example_test
+    - <<: *if-label-example_test_esp32s3
     - <<: *if-label-target_test
     - <<: *if-dev-push
-      changes: *patterns-example_test-related_changes-wifi
+      changes: *patterns-example_test-wifi
 
 .rules:test:host_test:
   rules:

.gitlab/ci/target-test.yml

@@ -89,7 +89,7 @@ example_test_pytest_esp32c3_flash_suspend:
 example_test_pytest_esp32_ethernet_ota:
   extends:
     - .pytest_examples_dir_template
-    - .rules:test:example_test-esp32-ota-related_changes
+    - .rules:test:example_test-esp32-ethernet
   needs:
     - build_pytest_examples_esp32
   tags: [ esp32, ethernet_ota ]
@@ -97,7 +97,7 @@ example_test_pytest_esp32_ethernet_ota:
 example_test_pytest_esp32_wifi_high_traffic:
   extends:
     - .pytest_examples_dir_template
-    - .rules:test:example_test-esp32
+    - .rules:test:example_test-esp32-wifi
   needs:
     - build_pytest_examples_esp32
   tags: [ esp32, wifi_high_traffic ]
@@ -105,7 +105,7 @@ example_test_pytest_esp32_wifi_high_traffic:
 example_test_pytest_esp32_flash_encryption_wifi_high_traffic:
   extends:
     - .pytest_examples_dir_template
-    - .rules:test:example_test-esp32-ota-related_changes-include_nightly_run
+    - .rules:test:example_test-esp32-include_nightly_run-rule
   needs:
     - build_pytest_examples_esp32
   tags: [ esp32, flash_encryption_wifi_high_traffic ]
@@ -113,7 +113,7 @@ example_test_pytest_esp32_flash_encryption_wifi_high_traffic:
 example_test_pytest_esp32c3_flash_encryption_wifi_high_traffic:
   extends:
     - .pytest_examples_dir_template
-    - .rules:test:example_test-esp32c3-ota-related_changes-include_nightly_run
+    - .rules:test:example_test-esp32c3-include_nightly_run-rule
   needs:
     - build_pytest_examples_esp32c3
   tags: [ esp32c3, flash_encryption_wifi_high_traffic ]
@@ -121,7 +121,7 @@ example_test_pytest_esp32c3_flash_encryption_wifi_high_traffic:
 example_test_pytest_esp32_ethernet:
   extends:
     - .pytest_examples_dir_template
-    - .rules:test:example_test-esp32
+    - .rules:test:example_test-esp32-ethernet
   needs:
     - build_pytest_examples_esp32
   tags: [ esp32, ethernet]
@@ -137,7 +137,7 @@ example_test_pytest_esp32_8mb_flash:
 example_test_pytest_esp32_wifi_ap:
   extends:
     - .pytest_examples_dir_template
-    - .rules:test:example_test-esp32
+    - .rules:test:example_test-esp32-wifi
   needs:
     - build_pytest_examples_esp32
   tags: [ esp32, wifi_ap ]
@@ -145,7 +145,7 @@ example_test_pytest_esp32_wifi_ap:
 example_test_pytest_esp32_wifi_router:
   extends:
     - .pytest_examples_dir_template
-    - .rules:test:example_test-esp32
+    - .rules:test:example_test-esp32-wifi
   needs:
     - build_pytest_examples_esp32
   tags: [ esp32, wifi_router ]
@@ -153,7 +153,7 @@ example_test_pytest_esp32_wifi_router:
 example_test_pytest_esp32_wifi_wlan:
   extends:
     - .pytest_examples_dir_template
-    - .rules:test:example_test-esp32-wifi-related_changes
+    - .rules:test:example_test-esp32-wifi
   needs:
     - build_pytest_examples_esp32
   tags: [ esp32, wifi_wlan ]
@@ -440,7 +440,9 @@ example_test_001C:
     - Example_GENERIC
 
 example_test_protocols:
-  extends: .example_test_esp32_template
+  extends:
+    - .example_test_esp32_template
+    - .rules:test:example_test-esp32-wifi
   tags:
     - ESP32
     - wifi_router
@@ -448,13 +450,15 @@ example_test_protocols:
 example_test_002:
   extends:
     - .example_test_esp32_template
-    - .rules:test:example_test-esp32-wifi-related_changes
+    - .rules:test:example_test-esp32-wifi
   tags:
     - ESP32
     - Example_ShieldBox_Basic
 
 example_test_ethernet_router:
-  extends: .example_test_esp32_template
+  extends:
+    - .example_test_esp32_template
+    - .rules:test:example_test-esp32-ethernet
   tags:
     - ESP32
     - ethernet_router
@@ -480,7 +484,7 @@ example_test_004B:
 example_test_005:
   extends:
     - .example_test_esp32_template
-    - .rules:test:example_test-esp32-bt-related_changes
+    - .rules:test:example_test-esp32-bt
   tags:
     - ESP32
     - Example_WIFI_BT

examples/system/ota/advanced_https_ota/pytest_advanced_ota.py

@@ -573,7 +573,6 @@ def test_examples_protocol_advanced_https_ota_example_partial_request(dut: Dut)
 @pytest.mark.esp32s2
 @pytest.mark.esp32s3
 @pytest.mark.wifi_high_traffic
-@pytest.mark.nightly_run
 @pytest.mark.parametrize('config', ['nimble',], indirect=True)
 def test_examples_protocol_advanced_https_ota_example_nimble_gatts(dut: Dut) -> None:
     """
@@ -626,7 +625,6 @@ def test_examples_protocol_advanced_https_ota_example_nimble_gatts(dut: Dut) ->
 @pytest.mark.esp32s2
 @pytest.mark.esp32s3
 @pytest.mark.wifi_high_traffic
-@pytest.mark.nightly_run
 @pytest.mark.parametrize('config', ['bluedroid',], indirect=True)
 def test_examples_protocol_advanced_https_ota_example_bluedroid_gatts(dut: Dut) -> None:
     """

examples/system/ota/advanced_https_ota/sdkconfig.ci.bluedroid

@@ -13,6 +13,8 @@ CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_example_with_ble.csv"
 CONFIG_PARTITION_TABLE_FILENAME="partitions_example_with_ble.csv"
 
+CONFIG_EXAMPLE_CONNECT_WIFI=y
+CONFIG_EXAMPLE_WIFI_SSID_PWD_FROM_STDIN=y
 CONFIG_EXAMPLE_FIRMWARE_UPGRADE_URL="FROM_STDIN"
 CONFIG_EXAMPLE_SKIP_COMMON_NAME_CHECK=y
 CONFIG_EXAMPLE_SKIP_VERSION_CHECK=y

examples/system/ota/advanced_https_ota/sdkconfig.ci.nimble

@@ -11,6 +11,7 @@ CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_example_with_ble.csv"
 CONFIG_PARTITION_TABLE_FILENAME="partitions_example_with_ble.csv"
 
+CONFIG_EXAMPLE_CONNECT_WIFI=y
 CONFIG_EXAMPLE_WIFI_SSID_PWD_FROM_STDIN=y
 CONFIG_EXAMPLE_FIRMWARE_UPGRADE_URL="FROM_STDIN"
 CONFIG_EXAMPLE_SKIP_COMMON_NAME_CHECK=y