Skip to content

Commit

Permalink
[cirque] pull cirque version and resolve cache issues for `third_part…
Browse files Browse the repository at this point in the history
…y/openthread` (#31131)

* Fix PATH order when launching cirque server

* print more detailed log

* test

* update

* Update

* fix cirque

* Pull cirque

* Update
  • Loading branch information
erjiaqing authored and pull[bot] committed Mar 29, 2024
1 parent 937c821 commit 4739171
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/cirque.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,10 @@ jobs:
--env GITHUB_ACTION_RUN=1 \
--env GITHUB_CACHE_PATH=${{ env.GITHUB_CACHE_PATH }} \
--volume /tmp:/tmp \
-- scripts/tests/cirque_tests.sh bootstrap
-- sh -c " \
git config --global --add safe.directory '*' \
&& scripts/tests/cirque_tests.sh bootstrap \
"
- name: Artifact suffix
id: outsuffix
Expand Down
5 changes: 4 additions & 1 deletion scripts/tests/cirque_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ function __cirquetest_clean_flask() {

function __cirquetest_build_ot() {
echo -e "[$BOLD_YELLOW_TEXT""INFO""$RESET_COLOR] Cache miss, build openthread simulation."
script/cmake-build simulation -DOT_THREAD_VERSION=1.2 -DOT_MTD=OFF -DOT_FTD=OFF -DWEB_GUI=0 -DNETWORK_MANAGER=0 -DREST_API=0 -DNAT64=0
script/cmake-build simulation -DOT_THREAD_VERSION=1.2 -DOT_MTD=OFF -DOT_FTD=OFF -DWEB_GUI=0 -DNETWORK_MANAGER=0 -DREST_API=0 -DNAT64=0 -DOT_LOG_OUTPUT=PLATFORM_DEFINED -DOT_LOG_LEVEL=DEBG
mkdir -p "$(dirname "$OT_SIMULATION_CACHE")"
tar czf "$OT_SIMULATION_CACHE" build
echo "$OPENTHREAD_CHECKOUT" >"$OT_SIMULATION_CACHE_STAMP_FILE"
Expand Down Expand Up @@ -123,6 +123,9 @@ function cirquetest_bootstrap() {

__cirquetest_build_ot_lazy
pip3 install -r requirements_nogrpc.txt

echo "OpenThread Version: $OPENTHREAD_CHECKOUT"
echo "ot-br-posix Version: $OT_BR_POSIX_CHECKOUT"
}

function cirquetest_run_test() {
Expand Down
2 changes: 1 addition & 1 deletion third_party/openthread/repo
Submodule repo updated 88 files
+1 −0 .github/dependabot.yml
+1 −1 .github/workflows/docker.yml
+89 −0 doc/ot_config_doc.h
+2 −0 src/cli/ftd.cmake
+2 −0 src/cli/mtd.cmake
+2 −0 src/cli/radio.cmake
+16 −1 src/core/config/announce_sender.h
+15 −0 src/core/config/backbone_router.h
+15 −0 src/core/config/border_agent.h
+15 −0 src/core/config/border_router.h
+15 −0 src/core/config/border_routing.h
+15 −0 src/core/config/channel_manager.h
+15 −0 src/core/config/channel_monitor.h
+15 −0 src/core/config/child_supervision.h
+15 −0 src/core/config/coap.h
+15 −0 src/core/config/commissioner.h
+15 −0 src/core/config/crypto.h
+15 −0 src/core/config/dataset_updater.h
+15 −0 src/core/config/dhcp6_client.h
+15 −0 src/core/config/dhcp6_server.h
+15 −0 src/core/config/diag.h
+15 −0 src/core/config/dns_client.h
+15 −0 src/core/config/dns_dso.h
+16 −1 src/core/config/dnssd_server.h
+15 −0 src/core/config/history_tracker.h
+15 −0 src/core/config/ip6.h
+15 −0 src/core/config/joiner.h
+15 −0 src/core/config/link_metrics_manager.h
+15 −0 src/core/config/link_quality.h
+15 −0 src/core/config/link_raw.h
+15 −0 src/core/config/logging.h
+15 −0 src/core/config/mac.h
+15 −0 src/core/config/mesh_diag.h
+15 −0 src/core/config/mesh_forwarder.h
+15 −0 src/core/config/misc.h
+15 −0 src/core/config/mle.h
+15 −0 src/core/config/nat64.h
+15 −0 src/core/config/netdata_publisher.h
+15 −0 src/core/config/network_diagnostic.h
+15 −0 src/core/config/parent_search.h
+15 −0 src/core/config/ping_sender.h
+15 −0 src/core/config/platform.h
+15 −0 src/core/config/power_calibration.h
+15 −0 src/core/config/radio_link.h
+15 −0 src/core/config/secure_transport.h
+15 −0 src/core/config/sntp_client.h
+16 −1 src/core/config/srp_client.h
+15 −0 src/core/config/srp_server.h
+15 −0 src/core/config/time_sync.h
+16 −0 src/core/config/tmf.h
+1 −1 src/core/diags/factory_diags.cpp
+2 −0 src/core/ftd.cmake
+2 −0 src/core/mtd.cmake
+62 −0 src/core/net/dns_types.cpp
+145 −0 src/core/net/dns_types.hpp
+29 −29 src/core/net/dnssd_server.cpp
+4 −6 src/core/net/dnssd_server.hpp
+33 −35 src/core/net/srp_server.cpp
+6 −0 src/core/net/srp_server.hpp
+2 −0 src/core/radio.cmake
+2 −0 src/core/radio_cli.cmake
+14 −2 src/lib/spinel/CMakeLists.txt
+2 −2 src/lib/spinel/example_vendor_hook.cpp
+2 −2 src/lib/spinel/example_vendor_hook.hpp
+3 −3 src/lib/spinel/openthread-spinel-config.h
+1 −1 src/lib/spinel/radio_spinel.cpp
+1 −1 src/lib/spinel/radio_spinel.hpp
+3 −5 src/lib/spinel/spinel.c
+2 −0 src/lib/spinel/spinel.h
+2 −0 src/ncp/ftd.cmake
+2 −0 src/ncp/mtd.cmake
+2 −0 src/ncp/radio.cmake
+1 −0 src/posix/platform/CMakeLists.txt
+1 −1 src/posix/platform/daemon.cpp
+1 −1 src/posix/platform/multicast_routing.cpp
+24 −24 src/posix/platform/netif.cpp
+2 −0 src/posix/platform/openthread-core-posix-config.h
+0 −34 src/posix/platform/openthread-posix-config.h
+72 −0 src/posix/platform/openthread-posix-daemon-config.h
+1 −1 src/posix/platform/radio.cpp
+2 −2 src/posix/platform/radio.hpp
+1 −1 src/posix/platform/radio_url.cpp
+14 −1 src/posix/platform/radio_url.hpp
+1 −1 src/posix/platform/udp.cpp
+2 −0 tests/fuzz/CMakeLists.txt
+4 −0 tests/unit/CMakeLists.txt
+84 −37 tests/unit/test_dns.cpp
+11 −11 tests/unit/test_dns_client.cpp

0 comments on commit 4739171

Please sign in to comment.