From efdf414c779caa1828f3b03a0541e3218c05da13 Mon Sep 17 00:00:00 2001 From: Shuchita Khare Date: Mon, 15 Jan 2024 09:43:16 +0000 Subject: [PATCH] Attempt to run Wifi test on NH agent --- Jenkinsfile | 32 +++++++++---------- .../sw_services/usb/thirdparty/tinyusb_src | 2 +- test/rtos_drivers/wifi/src/FreeRTOSIPConfig.h | 17 +++++----- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3e2e8d06..44a2adee 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -26,8 +26,8 @@ pipeline { VENV_DIRNAME = ".venv" BUILD_DIRNAME = "dist" RTOS_TEST_RIG_TARGET = "XCORE-AI-EXPLORER" - LOCAL_WIFI_SSID = credentials('bristol-office-development-wifi-ssid') - LOCAL_WIFI_PASS = credentials('bristol-office-development-wifi-password') + LOCAL_WIFI_SSID = credentials('hampton-office-network-ssid') + LOCAL_WIFI_PASS = credentials('hampton-office-network-wifi-password') } stages { stage('Build and Docs') { @@ -106,20 +106,20 @@ pipeline { sh "rm -f ~/.xtag/status.lock ~/.xtag/acquired" } } - //stage('Run RTOS Drivers WiFi test') { - // steps { - // withTools(params.TOOLS_VERSION) { - // withVenv { - // script { - // withXTAG(["$RTOS_TEST_RIG_TARGET"]) { adapterIDs -> - // sh "test/rtos_drivers/wifi/check_wifi.sh " + adapterIDs[0] - // } - // sh "pytest test/rtos_drivers/wifi" - // } - // } - // } - // } - //} + stage('Run RTOS Drivers WiFi test') { + steps { + withTools(params.TOOLS_VERSION) { + withVenv { + script { + withXTAG(["$RTOS_TEST_RIG_TARGET"]) { adapterIDs -> + sh "test/rtos_drivers/wifi/check_wifi.sh " + adapterIDs[0] + } + sh "pytest test/rtos_drivers/wifi" + } + } + } + } + } stage('Run RTOS Drivers HIL test') { steps { withTools(params.TOOLS_VERSION) { diff --git a/modules/sw_services/usb/thirdparty/tinyusb_src b/modules/sw_services/usb/thirdparty/tinyusb_src index d86ce478..543025a5 160000 --- a/modules/sw_services/usb/thirdparty/tinyusb_src +++ b/modules/sw_services/usb/thirdparty/tinyusb_src @@ -1 +1 @@ -Subproject commit d86ce478998dc71e6fd3ea32d1e94d58ca3e4fa5 +Subproject commit 543025a5da7ac8521035a582684abc80a9924a1f diff --git a/test/rtos_drivers/wifi/src/FreeRTOSIPConfig.h b/test/rtos_drivers/wifi/src/FreeRTOSIPConfig.h index 36d87eb9..829762d7 100644 --- a/test/rtos_drivers/wifi/src/FreeRTOSIPConfig.h +++ b/test/rtos_drivers/wifi/src/FreeRTOSIPConfig.h @@ -48,18 +48,18 @@ /* User defined network parameters */ #define IPconfig_IP_ADDR_OCTET_0 10 #define IPconfig_IP_ADDR_OCTET_1 0 -#define IPconfig_IP_ADDR_OCTET_2 201 -#define IPconfig_IP_ADDR_OCTET_3 3 +#define IPconfig_IP_ADDR_OCTET_2 0 +#define IPconfig_IP_ADDR_OCTET_3 1 #define IPconfig_NET_MASK_OCTET_0 255 -#define IPconfig_NET_MASK_OCTET_1 255 -#define IPconfig_NET_MASK_OCTET_2 255 -#define IPconfig_NET_MASK_OCTET_3 0 +#define IPconfig_NET_MASK_OCTET_1 0 +#define IPconfig_NET_MASK_OCTET_2 0 +#define IPconfig_NET_MASK_OCTET_3 0 #define IPconfig_GATEWAY_OCTET_0 10 -#define IPconfig_GATEWAY_OCTET_1 0 -#define IPconfig_GATEWAY_OCTET_2 201 -#define IPconfig_GATEWAY_OCTET_3 1 +#define IPconfig_GATEWAY_OCTET_1 0 +#define IPconfig_GATEWAY_OCTET_2 0 +#define IPconfig_GATEWAY_OCTET_3 1 #define IPconfig_DNS_SERVER_OCTET_0 8 #define IPconfig_DNS_SERVER_OCTET_1 8 @@ -74,7 +74,6 @@ #define IPconfig_MAC_ADDR_OCTET_5 0x00 - /* Prototype for the function used to print out. In this case it prints to the console before the network is connected then a UDP port after the network has connected. */