Merge branch 'bugfix/ci_weekend_test_update_v4.0' into 'release/v4.0'

ci: a build_system_test(_cmake) fix and some mqtt fixes (backport v4.0)

See merge request espressif/esp-idf!7773
This commit is contained in:
Angus Gratton 2020-03-02 12:43:34 +08:00
commit a2af518069
6 changed files with 7 additions and 4 deletions

View file

@ -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

View file

@ -127,7 +127,7 @@ test_weekend_mqtt:
TEST_CASE_PATH: "$CI_PROJECT_DIR/components/mqtt/weekend_test"
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
@ -143,7 +143,7 @@ test_weekend_network:
TEST_CASE_PATH: "$CI_PROJECT_DIR/components/lwip/weekend_test"
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

View file

@ -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..."

View file

@ -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..."