From 4e10048400943c99a13e37a720e5bdb46fd71c5d Mon Sep 17 00:00:00 2001
From: Ondrej Kosta <ondrej.kosta@espressif.com>
Date: Mon, 19 Jun 2023 16:09:28 +0200
Subject: [PATCH] Moved 'eth2ap' example to /examples/network folder

Ethernet related .build-test-rules.yml cleanup
---
 examples/ethernet/.build-test-rules.yml             |   6 ------
 examples/network/.build-test-rules.yml              |   8 +++++++-
 .../{ethernet => network}/eth2ap/CMakeLists.txt     |   0
 examples/{ethernet => network}/eth2ap/README.md     |   0
 examples/{ethernet => network}/eth2ap/eth2ap.png    | Bin
 .../eth2ap/main/CMakeLists.txt                      |   0
 .../eth2ap/main/Kconfig.projbuild                   |   0
 .../eth2ap/main/ethernet_example_main.c             |   5 +++++
 8 files changed, 12 insertions(+), 7 deletions(-)
 rename examples/{ethernet => network}/eth2ap/CMakeLists.txt (100%)
 rename examples/{ethernet => network}/eth2ap/README.md (100%)
 rename examples/{ethernet => network}/eth2ap/eth2ap.png (100%)
 rename examples/{ethernet => network}/eth2ap/main/CMakeLists.txt (100%)
 rename examples/{ethernet => network}/eth2ap/main/Kconfig.projbuild (100%)
 rename examples/{ethernet => network}/eth2ap/main/ethernet_example_main.c (98%)

diff --git a/examples/ethernet/.build-test-rules.yml b/examples/ethernet/.build-test-rules.yml
index e86b80bcd5..dedd053158 100644
--- a/examples/ethernet/.build-test-rules.yml
+++ b/examples/ethernet/.build-test-rules.yml
@@ -1,11 +1,5 @@
 # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps
 
-examples/ethernet/eth2ap:
-  disable:
-    - if: IDF_TARGET == "esp32h2"
-      temporary: true
-      reason: esp32h2 is not supported
-
 examples/ethernet/iperf:
   disable_test:
     - if: IDF_TARGET not in ["esp32"]
diff --git a/examples/network/.build-test-rules.yml b/examples/network/.build-test-rules.yml
index 2d2e70f24d..f65e03fe62 100644
--- a/examples/network/.build-test-rules.yml
+++ b/examples/network/.build-test-rules.yml
@@ -4,13 +4,19 @@ examples/network/bridge:
   disable_test:
     - if: IDF_TARGET != "esp32"
       reason: Generic functionality, no need to be run on specific targets
+
+examples/network/eth2ap:
+  disable:
+    - if: SOC_WIFI_SUPPORTED != 1
+
 examples/network/simple_sniffer:
   disable:
-    - if: IDF_TARGET in ["esp32h2"]
+    - if: SOC_WIFI_SUPPORTED != 1
   disable_test:
     - if: IDF_TARGET not in ["esp32", "esp32c3", "esp32s3"]
       temporary: true
       reason: lack of runners
+
 examples/network/sta_to_eth:
   disable:
     - if: SOC_WIFI_SUPPORTED != 1
diff --git a/examples/ethernet/eth2ap/CMakeLists.txt b/examples/network/eth2ap/CMakeLists.txt
similarity index 100%
rename from examples/ethernet/eth2ap/CMakeLists.txt
rename to examples/network/eth2ap/CMakeLists.txt
diff --git a/examples/ethernet/eth2ap/README.md b/examples/network/eth2ap/README.md
similarity index 100%
rename from examples/ethernet/eth2ap/README.md
rename to examples/network/eth2ap/README.md
diff --git a/examples/ethernet/eth2ap/eth2ap.png b/examples/network/eth2ap/eth2ap.png
similarity index 100%
rename from examples/ethernet/eth2ap/eth2ap.png
rename to examples/network/eth2ap/eth2ap.png
diff --git a/examples/ethernet/eth2ap/main/CMakeLists.txt b/examples/network/eth2ap/main/CMakeLists.txt
similarity index 100%
rename from examples/ethernet/eth2ap/main/CMakeLists.txt
rename to examples/network/eth2ap/main/CMakeLists.txt
diff --git a/examples/ethernet/eth2ap/main/Kconfig.projbuild b/examples/network/eth2ap/main/Kconfig.projbuild
similarity index 100%
rename from examples/ethernet/eth2ap/main/Kconfig.projbuild
rename to examples/network/eth2ap/main/Kconfig.projbuild
diff --git a/examples/ethernet/eth2ap/main/ethernet_example_main.c b/examples/network/eth2ap/main/ethernet_example_main.c
similarity index 98%
rename from examples/ethernet/eth2ap/main/ethernet_example_main.c
rename to examples/network/eth2ap/main/ethernet_example_main.c
index afccd20451..27ed39a3b5 100644
--- a/examples/ethernet/eth2ap/main/ethernet_example_main.c
+++ b/examples/network/eth2ap/main/ethernet_example_main.c
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
 /* eth2ap (Ethernet to Wi-Fi AP packet forwarding) Example
 
    This example code is in the Public Domain (or CC0 licensed, at your option.)