feedc0de/esp-protocols
1
0
Fork 0
forked from espressif/esp-protocols
Code Pull Requests Activity

Merge pull request #191 from gabsuren/CI/refactor_yml_files

Browse Source 
CI: Minor refactoring of *yml files for the target tests
This commit is contained in:
Suren
2022-12-16 11:32:14 +04:00
committed by GitHub
parent 7d47ec3b6b b56b1c577b
commit c7f20ee98e
1 changed files with 58 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
.github/workflows/target-test.yml vendored
View File

@ -65,6 +65,8 @@ jobs:
config: ["eth_custom_netif", "eth_def", "eth_no_ipv6", "eth_socket"] config: ["eth_custom_netif", "eth_def", "eth_no_ipv6", "eth_socket"]
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: espressif/idf:${{ matrix.idf_ver }} container: espressif/idf:${{ matrix.idf_ver }}
env:
TEST_DIR: components/mdns/examples
steps: steps:
- name: Checkout esp-protocols - name: Checkout esp-protocols
uses: actions/checkout@v3 uses: actions/checkout@v3
@ -74,7 +76,7 @@ jobs:
env: env:
IDF_TARGET: ${{ matrix.idf_target }} IDF_TARGET: ${{ matrix.idf_target }}
shell: bash shell: bash
working-directory: components/mdns/examples/ working-directory: ${{ env.TEST_DIR }}
run: | run: |
. ${IDF_PATH}/export.sh . ${IDF_PATH}/export.sh
rm -rf sdkconfig sdkconfig.defaults build build_${{ matrix.config }} rm -rf sdkconfig sdkconfig.defaults build build_${{ matrix.config }}
@ -83,7 +85,7 @@ jobs:
idf.py build idf.py build
mv build build_${{ matrix.config }} mv build build_${{ matrix.config }}
- name: Merge binaries with IDF-${{ matrix.idf_ver }} for ${{ matrix.config }} - name: Merge binaries with IDF-${{ matrix.idf_ver }} for ${{ matrix.config }}
working-directory: components/mdns/examples working-directory: ${{ env.TEST_DIR }}
env: env:
IDF_TARGET: ${{ matrix.idf_target }} IDF_TARGET: ${{ matrix.idf_target }}
shell: bash shell: bash
@ -91,19 +93,17 @@ jobs:
. ${IDF_PATH}/export.sh . ${IDF_PATH}/export.sh
cd build_${{ matrix.config }} cd build_${{ matrix.config }}
esptool.py --chip ${{ matrix.idf_target }} merge_bin --fill-flash-size 4MB -o flash_image.bin @flash_args esptool.py --chip ${{ matrix.idf_target }} merge_bin --fill-flash-size 4MB -o flash_image.bin @flash_args
cd ../ - uses: actions/upload-artifact@v3
cat build_${{ matrix.config }}/config/sdkconfig.json
- uses: actions/upload-artifact@v2
with: with:
name: examples_app_bin_${{ matrix.idf_target }}_${{ matrix.idf_ver }}_${{ matrix.config }} name: examples_app_bin_${{ matrix.idf_target }}_${{ matrix.idf_ver }}_${{ matrix.config }}
path: | path: |
components/mdns/examples/build_${{ matrix.config }}/bootloader/bootloader.bin ${{ env.TEST_DIR }}/build_${{ matrix.config }}/bootloader/bootloader.bin
components/mdns/examples/build_${{ matrix.config }}/partition_table/partition-table.bin ${{ env.TEST_DIR }}/build_${{ matrix.config }}/partition_table/partition-table.bin
components/mdns/examples/build_${{ matrix.config }}/*.bin ${{ env.TEST_DIR }}/build_${{ matrix.config }}/*.bin
components/mdns/examples/build_${{ matrix.config }}/*.elf ${{ env.TEST_DIR }}/build_${{ matrix.config }}/*.elf
components/mdns/examples/build_${{ matrix.config }}/flasher_args.json ${{ env.TEST_DIR }}/build_${{ matrix.config }}/flasher_args.json
components/mdns/examples/build_${{ matrix.config }}/config/sdkconfig.h ${{ env.TEST_DIR }}/build_${{ matrix.config }}/config/sdkconfig.h
components/mdns/examples/build_${{ matrix.config }}/config/sdkconfig.json ${{ env.TEST_DIR }}/build_${{ matrix.config }}/config/sdkconfig.json
if-no-files-found: error if-no-files-found: error
build_asio: build_asio:
@ -114,13 +114,15 @@ jobs:
example: ["asio_chat", "async_request", "socks4", "ssl_client_server", "tcp_echo_server", "udp_echo_server"] example: ["asio_chat", "async_request", "socks4", "ssl_client_server", "tcp_echo_server", "udp_echo_server"]
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: espressif/idf:${{ matrix.idf_ver }} container: espressif/idf:${{ matrix.idf_ver }}
env:
TEST_DIR: components/asio/examples
steps: steps:
- name: Checkout esp-protocols - name: Checkout esp-protocols
uses: actions/checkout@v3 uses: actions/checkout@v3
with: with:
submodules: recursive submodules: recursive
- name: Build ${{ matrix.example }} with IDF-${{ matrix.idf_ver }} for ${{ matrix.idf_target }} - name: Build ${{ matrix.example }} with IDF-${{ matrix.idf_ver }} for ${{ matrix.idf_target }}
working-directory: components/asio/examples/${{ matrix.example }} working-directory: ${{ env.TEST_DIR }}/${{ matrix.example }}
env: env:
IDF_TARGET: ${{ matrix.idf_target }} IDF_TARGET: ${{ matrix.idf_target }}
shell: bash shell: bash
@ -130,7 +132,7 @@ jobs:
idf.py set-target ${{ matrix.idf_target }} idf.py set-target ${{ matrix.idf_target }}
idf.py build idf.py build
- name: Merge binaries with IDF-${{ matrix.idf_ver }} for ${{ matrix.idf_target }} for ${{ matrix.example }} - name: Merge binaries with IDF-${{ matrix.idf_ver }} for ${{ matrix.idf_target }} for ${{ matrix.example }}
working-directory: components/asio/examples/${{ matrix.example }}/build working-directory: ${{ env.TEST_DIR }}/${{ matrix.example }}/build
env: env:
IDF_TARGET: ${{ matrix.idf_target }} IDF_TARGET: ${{ matrix.idf_target }}
shell: bash shell: bash
@ -141,13 +143,13 @@ jobs:
with: with:
name: examples_app_bin_${{ matrix.idf_target }}_${{ matrix.idf_ver }}_${{ matrix.example }} name: examples_app_bin_${{ matrix.idf_target }}_${{ matrix.idf_ver }}_${{ matrix.example }}
path: | path: |
components/asio/examples/${{ matrix.example }}/build/bootloader/bootloader.bin ${{ env.TEST_DIR }}/${{ matrix.example }}/build/bootloader/bootloader.bin
components/asio/examples/${{ matrix.example }}/build//partition_table/partition-table.bin ${{ env.TEST_DIR }}/${{ matrix.example }}/build//partition_table/partition-table.bin
components/asio/examples/${{ matrix.example }}/build/*.bin ${{ env.TEST_DIR }}/${{ matrix.example }}/build/*.bin
components/asio/examples/${{ matrix.example }}/build/*.elf ${{ env.TEST_DIR }}/${{ matrix.example }}/build/*.elf
components/asio/examples/${{ matrix.example }}/build/flasher_args.json ${{ env.TEST_DIR }}/${{ matrix.example }}/build/flasher_args.json
components/asio/examples/${{ matrix.example }}/build/config/sdkconfig.h ${{ env.TEST_DIR }}/${{ matrix.example }}/build/config/sdkconfig.h
components/asio/examples/${{ matrix.example }}/build/config/sdkconfig.json ${{ env.TEST_DIR }}/${{ matrix.example }}/build/config/sdkconfig.json
if-no-files-found: error if-no-files-found: error
@ -158,6 +160,8 @@ jobs:
idf_target: ["esp32"] idf_target: ["esp32"]
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: espressif/idf:${{ matrix.idf_ver }} container: espressif/idf:${{ matrix.idf_ver }}
env:
TEST_DIR: components/esp_websocket_client/examples
steps: steps:
- name: Checkout esp-protocols - name: Checkout esp-protocols
uses: actions/checkout@v3 uses: actions/checkout@v3
@ -167,30 +171,30 @@ jobs:
env: env:
IDF_TARGET: ${{ matrix.idf_target }} IDF_TARGET: ${{ matrix.idf_target }}
shell: bash shell: bash
working-directory: components/esp_websocket_client/examples/ working-directory: ${{ env.TEST_DIR }}
run: | run: |
. ${IDF_PATH}/export.sh . ${IDF_PATH}/export.sh
cat sdkconfig.ci >> sdkconfig.defaults cat sdkconfig.ci >> sdkconfig.defaults
idf.py build idf.py build
- name: Merge binaries - name: Merge binaries
working-directory: components/esp_websocket_client/examples/build working-directory: ${{ env.TEST_DIR }}/build
env: env:
IDF_TARGET: ${{ matrix.idf_target }} IDF_TARGET: ${{ matrix.idf_target }}
shell: bash shell: bash
run: | run: |
. ${IDF_PATH}/export.sh . ${IDF_PATH}/export.sh
esptool.py --chip ${{ matrix.idf_target }} merge_bin --fill-flash-size 4MB -o flash_image.bin @flash_args esptool.py --chip ${{ matrix.idf_target }} merge_bin --fill-flash-size 4MB -o flash_image.bin @flash_args
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v3
with: with:
name: examples_app_bin_${{ matrix.idf_target }}_${{ matrix.idf_ver }} name: examples_app_bin_${{ matrix.idf_target }}_${{ matrix.idf_ver }}
path: | path: |
components/esp_websocket_client/examples/build/bootloader/bootloader.bin ${{ env.TEST_DIR }}/build/bootloader/bootloader.bin
components/esp_websocket_client/examples/build/partition_table/partition-table.bin ${{ env.TEST_DIR }}/build/partition_table/partition-table.bin
components/esp_websocket_client/examples/build/*.bin ${{ env.TEST_DIR }}/build/*.bin
components/esp_websocket_client/examples/build/*.elf ${{ env.TEST_DIR }}/build/*.elf
components/esp_websocket_client/examples/build/flasher_args.json ${{ env.TEST_DIR }}/build/flasher_args.json
components/esp_websocket_client/examples/build/config/sdkconfig.h ${{ env.TEST_DIR }}/build/config/sdkconfig.h
components/esp_websocket_client/examples/build/config/sdkconfig.json ${{ env.TEST_DIR }}/build/config/sdkconfig.json
if-no-files-found: error if-no-files-found: error
run-target-websocket: run-target-websocket:
@ -204,14 +208,16 @@ jobs:
runs-on: runs-on:
- self-hosted - self-hosted
- ESP32-ETHERNET-KIT - ESP32-ETHERNET-KIT
env:
TEST_DIR: components/esp_websocket_client/examples
# Skip running on forks since it won't have access to secrets # Skip running on forks since it won't have access to secrets
if: github.repository == 'espressif/esp-protocols' if: github.repository == 'espressif/esp-protocols'
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/download-artifact@v2 - uses: actions/download-artifact@v3
with: with:
name: examples_app_bin_${{ matrix.idf_target }}_${{ matrix.idf_ver }} name: examples_app_bin_${{ matrix.idf_target }}_${{ matrix.idf_ver }}
path: components/esp_websocket_client/examples/build/ path: ${{ env.TEST_DIR }}/build/
- name: Install Python packages - name: Install Python packages
env: env:
PIP_EXTRA_INDEX_URL: "https://www.piwheels.org/simple" PIP_EXTRA_INDEX_URL: "https://www.piwheels.org/simple"
@ -220,14 +226,14 @@ jobs:
- name: Download Example Test to target - name: Download Example Test to target
run: python -m esptool --chip ${{ matrix.idf_target }} write_flash 0x0 components/esp_websocket_client/examples/build/flash_image.bin run: python -m esptool --chip ${{ matrix.idf_target }} write_flash 0x0 components/esp_websocket_client/examples/build/flash_image.bin
- name: Run Example Test on target - name: Run Example Test on target
working-directory: components/esp_websocket_client/examples working-directory: ${{ env.TEST_DIR }}
run: | run: |
python -m pytest --log-cli-level DEBUG --junit-xml=./examples_results_${{ matrix.idf_target }}_${{ matrix.idf_ver }}.xml --target=${{ matrix.idf_target }} python -m pytest --log-cli-level DEBUG --junit-xml=./examples_results_${{ matrix.idf_target }}_${{ matrix.idf_ver }}.xml --target=${{ matrix.idf_target }}
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v3
if: always() if: always()
with: with:
name: examples_results_${{ matrix.idf_target }}_${{ matrix.idf_ver }} name: examples_results_${{ matrix.idf_target }}_${{ matrix.idf_ver }}
path: components/esp_websocket_client/examples/*.xml path: ${{ env.TEST_DIR }}/*.xml
run-target-mdns: run-target-mdns:
strategy: strategy:
@ -240,16 +246,18 @@ jobs:
runs-on: runs-on:
- self-hosted - self-hosted
- ESP32-ETHERNET-KIT - ESP32-ETHERNET-KIT
env:
TEST_DIR: components/mdns/examples
# Skip running on forks since it won't have access to secrets # Skip running on forks since it won't have access to secrets
if: github.repository == 'espressif/esp-protocols' if: github.repository == 'espressif/esp-protocols'
steps: steps:
- name: Clear repository - name: Clear repository
run: sudo rm -fr $GITHUB_WORKSPACE && mkdir $GITHUB_WORKSPACE run: sudo rm -fr $GITHUB_WORKSPACE && mkdir $GITHUB_WORKSPACE
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/download-artifact@v2 - uses: actions/download-artifact@v3
with: with:
name: examples_app_bin_${{ matrix.idf_target }}_${{ matrix.idf_ver }}_${{ matrix.config }} name: examples_app_bin_${{ matrix.idf_target }}_${{ matrix.idf_ver }}_${{ matrix.config }}
path: components/mdns/examples/build_${{ matrix.config }} path: ${{ env.TEST_DIR }}/build_${{ matrix.config }}
- name: Install Python packages - name: Install Python packages
env: env:
PIP_EXTRA_INDEX_URL: "https://www.piwheels.org/simple" PIP_EXTRA_INDEX_URL: "https://www.piwheels.org/simple"
@ -261,16 +269,15 @@ jobs:
- name: Run Example Test on target ${{ matrix.config }} - name: Run Example Test on target ${{ matrix.config }}
working-directory: components/mdns/examples working-directory: components/mdns/examples
run: | run: |
rm -rf build rm -rf build sdkconfig.defaults
mv build_${{ matrix.config }} build mv build_${{ matrix.config }} build
cat sdkconfig.ci.${{ matrix.config }} >> sdkconfig.defaults cat sdkconfig.ci.${{ matrix.config }} >> sdkconfig.defaults
python -m pytest --log-cli-level DEBUG --junit-xml=./examples_results_${{ matrix.idf_target }}_${{ matrix.idf_ver }}_${{ matrix.config }}.xml --target=${{ matrix.idf_target }} python -m pytest --log-cli-level DEBUG --junit-xml=./examples_results_${{ matrix.idf_target }}_${{ matrix.idf_ver }}_${{ matrix.config }}.xml --target=${{ matrix.idf_target }}
rm -rf build sdkconfig.defaults - uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v2
if: always() if: always()
with: with:
name: examples_results_${{ matrix.idf_target }}_${{ matrix.idf_ver }}_${{ matrix.config }} name: examples_results_${{ matrix.idf_target }}_${{ matrix.idf_ver }}_${{ matrix.config }}
path: components/mdns/examples/*.xml path: ${{ env.TEST_DIR }}/*.xml
run-target-asio: run-target-asio:
strategy: strategy:
@ -283,6 +290,8 @@ jobs:
runs-on: runs-on:
- self-hosted - self-hosted
- ESP32-ETHERNET-KIT - ESP32-ETHERNET-KIT
env:
TEST_DIR: components/asio/examples
# Skip running on forks since it won't have access to secrets # Skip running on forks since it won't have access to secrets
if: github.repository == 'espressif/esp-protocols' if: github.repository == 'espressif/esp-protocols'
steps: steps:
@ -292,7 +301,7 @@ jobs:
- uses: actions/download-artifact@v3 - uses: actions/download-artifact@v3
with: with:
name: examples_app_bin_${{ matrix.idf_target }}_${{ matrix.idf_ver }}_${{ matrix.example }} name: examples_app_bin_${{ matrix.idf_target }}_${{ matrix.idf_ver }}_${{ matrix.example }}
path: components/asio/examples/${{ matrix.example }}/build path: ${{ env.TEST_DIR }}/${{ matrix.example }}/build
- name: Install Python packages - name: Install Python packages
env: env:
PIP_EXTRA_INDEX_URL: "https://www.piwheels.org/simple" PIP_EXTRA_INDEX_URL: "https://www.piwheels.org/simple"
@ -300,16 +309,16 @@ jobs:
sudo apt-get install -y dnsutils sudo apt-get install -y dnsutils
- name: Download Example Test to target ${{ matrix.config }} - name: Download Example Test to target ${{ matrix.config }}
run: | run: |
python -m esptool --chip ${{ matrix.idf_target }} write_flash 0x0 components/asio/examples/${{ matrix.example }}/build/flash_image.bin python -m esptool --chip ${{ matrix.idf_target }} write_flash 0x0 ${{ env.TEST_DIR }}/${{ matrix.example }}/build/flash_image.bin
- name: Run Example Test ${{ matrix.example }} on target - name: Run Example Test ${{ matrix.example }} on target
working-directory: components/asio/examples/${{ matrix.example }} working-directory: ${{ env.TEST_DIR }}/${{ matrix.example }}
run: | run: |
python -m pytest --log-cli-level DEBUG --junit-xml=./examples_results_${{ matrix.idf_target }}_${{ matrix.idf_ver }}_${{ matrix.config }}.xml --target=${{ matrix.idf_target }} python -m pytest --log-cli-level DEBUG --junit-xml=./examples_results_${{ matrix.idf_target }}_${{ matrix.idf_ver }}_${{ matrix.config }}.xml --target=${{ matrix.idf_target }}
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v3
if: always() if: always()
with: with:
name: examples_results_${{ matrix.idf_target }}_${{ matrix.idf_ver }}_${{ matrix.example }} name: examples_results_${{ matrix.idf_target }}_${{ matrix.idf_ver }}_${{ matrix.example }}
path: components/asio/examples/${{ matrix.example }}/*.xml path: ${{ env.TEST_DIR }}/${{ matrix.example }}/*.xml
build_esp_modem_tests: build_esp_modem_tests:
strategy: strategy:
@ -340,7 +349,7 @@ jobs:
idf.py build idf.py build
$GITHUB_WORKSPACE/ci/clean_build_artifacts.sh ${GITHUB_WORKSPACE}/${TEST_DIR}/build $GITHUB_WORKSPACE/ci/clean_build_artifacts.sh ${GITHUB_WORKSPACE}/${TEST_DIR}/build
ls build ls build
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v3
with: with:
name: modem_target_bin_${{ matrix.idf_target }}_${{ matrix.idf_ver }}_${{ matrix.test.app }} name: modem_target_bin_${{ matrix.idf_target }}_${{ matrix.idf_ver }}_${{ matrix.test.app }}
path: ${{ env.TEST_DIR }}/build path: ${{ env.TEST_DIR }}/build
@ -365,7 +374,7 @@ jobs:
- name: Clear repository - name: Clear repository
run: sudo rm -fr $GITHUB_WORKSPACE && mkdir $GITHUB_WORKSPACE run: sudo rm -fr $GITHUB_WORKSPACE && mkdir $GITHUB_WORKSPACE
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/download-artifact@v2 - uses: actions/download-artifact@v3
with: with:
name: modem_target_bin_${{ matrix.idf_target }}_${{ matrix.idf_ver }}_${{ matrix.test.app }} name: modem_target_bin_${{ matrix.idf_target }}_${{ matrix.idf_ver }}_${{ matrix.test.app }}
path: ${{ env.TEST_DIR }}/build path: ${{ env.TEST_DIR }}/build