Просмотр исходного кода

Merge branch 'bugfix/ci_weekend_test_update' into 'master'

CI: weekend test fixes

See merge request espressif/esp-idf!6235
Angus Gratton 6 лет назад
Родитель
Сommit
5ce95f2bfd

+ 0 - 0
components/lwip/weekend_test/config.yml → components/lwip/weekend_test/test_weekend_network_.yml


+ 0 - 0
components/mqtt/weekend_test/config.yml → components/mqtt/weekend_test/test_weekend_mqtt_.yml


+ 3 - 0
examples/protocols/mqtt/publish_test/sdkconfig.ci

@@ -3,3 +3,6 @@ CONFIG_EXAMPLE_BROKER_TCP_URI="mqtt://${EXAMPLE_MQTT_BROKER_TCP}"
 CONFIG_EXAMPLE_BROKER_WS_URI="ws://${EXAMPLE_MQTT_BROKER_WS}/ws"
 CONFIG_EXAMPLE_BROKER_WSS_URI="wss://${EXAMPLE_MQTT_BROKER_WSS}/ws"
 CONFIG_EXAMPLE_BROKER_CERTIFICATE_OVERRIDE="${EXAMPLE_MQTT_BROKER_CERTIFICATE}"
+CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y
+CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=16384
+CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=16384

+ 2 - 2
tools/ci/config/target-test.yml

@@ -129,7 +129,7 @@ test_weekend_mqtt:
     TEST_FW_PATH: "$CI_PROJECT_DIR/tools/tiny-test-fw"
     LOG_PATH: "$CI_PROJECT_DIR/TEST_LOGS"
     ENV_FILE: "$CI_PROJECT_DIR/components/mqtt/weekend_test/env.yml"
-    CONFIG_FILE: "$CI_PROJECT_DIR/components/mqtt/weekend_test/config.yml"
+    CONFIG_FILE_PATH: "$CI_PROJECT_DIR/components/mqtt/weekend_test"
 
 test_weekend_network:
   extends: .example_test_template
@@ -146,7 +146,7 @@ test_weekend_network:
     TEST_FW_PATH: "$CI_PROJECT_DIR/tools/tiny-test-fw"
     LOG_PATH: "$CI_PROJECT_DIR/TEST_LOGS"
     ENV_FILE: "$CI_PROJECT_DIR/components/lwip/weekend_test/env.yml"
-    CONFIG_FILE: "$CI_PROJECT_DIR/components/lwip/weekend_test/config.yml"
+    CONFIG_FILE_PATH: "$CI_PROJECT_DIR/components/lwip/weekend_test"
 
 example_test_001:
   extends: .example_test_template

+ 1 - 1
tools/ci/test_build_system.sh

@@ -46,7 +46,7 @@ function run_tests()
     if [ -z $CHECKOUT_REF_SCRIPT ]; then
         git checkout ${CI_BUILD_REF_NAME} || echo "Using esp-idf-template default branch..."
     else
-        $CHECKOUT_REF_SCRIPT esp-idf-template
+        $CHECKOUT_REF_SCRIPT esp-idf-template .
     fi
 
     print_status "Updating template config..."

+ 1 - 1
tools/ci/test_build_system_cmake.sh

@@ -48,7 +48,7 @@ function run_tests()
     if [ -z $CHECKOUT_REF_SCRIPT ]; then
         git checkout ${CI_BUILD_REF_NAME} || echo "Using esp-idf-template default branch..."
     else
-        $CHECKOUT_REF_SCRIPT esp-idf-template
+        $CHECKOUT_REF_SCRIPT esp-idf-template .
     fi
 
     print_status "Try to clean fresh directory..."