espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 04:04:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ci_weekend_test_update' into 'master'

Browse Source 
CI: weekend test fixes

See merge request espressif/esp-idf!6235
This commit is contained in:
Angus Gratton
2019-10-14 15:30:33 +08:00
parent 92a507c0aa 784a0d21ea
commit 5ce95f2bfd
6 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
components/lwip/weekend_test/config.yml → components/lwip/weekend_test/test_weekend_network_.yml
View File

0
components/mqtt/weekend_test/config.yml → components/mqtt/weekend_test/test_weekend_mqtt_.yml
View File

3
examples/protocols/mqtt/publish_test/sdkconfig.ci
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_WS_URI="ws://${EXAMPLE_MQTT_BROKER_WS}/ws"
CONFIG_EXAMPLE_BROKER_WSS_URI="wss://${EXAMPLE_MQTT_BROKER_WSS}/ws" CONFIG_EXAMPLE_BROKER_WSS_URI="wss://${EXAMPLE_MQTT_BROKER_WSS}/ws"
CONFIG_EXAMPLE_BROKER_CERTIFICATE_OVERRIDE="${EXAMPLE_MQTT_BROKER_CERTIFICATE}" 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

4
tools/ci/config/target-test.yml
View File

@@ -129,7 +129,7 @@ test_weekend_mqtt:
TEST_FW_PATH: "$CI_PROJECT_DIR/tools/tiny-test-fw" TEST_FW_PATH: "$CI_PROJECT_DIR/tools/tiny-test-fw"
LOG_PATH: "$CI_PROJECT_DIR/TEST_LOGS" LOG_PATH: "$CI_PROJECT_DIR/TEST_LOGS"
ENV_FILE: "$CI_PROJECT_DIR/components/mqtt/weekend_test/env.yml" 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: test_weekend_network:
extends: .example_test_template extends: .example_test_template
@@ -146,7 +146,7 @@ test_weekend_network:
TEST_FW_PATH: "$CI_PROJECT_DIR/tools/tiny-test-fw" TEST_FW_PATH: "$CI_PROJECT_DIR/tools/tiny-test-fw"
LOG_PATH: "$CI_PROJECT_DIR/TEST_LOGS" LOG_PATH: "$CI_PROJECT_DIR/TEST_LOGS"
ENV_FILE: "$CI_PROJECT_DIR/components/lwip/weekend_test/env.yml" 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: example_test_001:
extends: .example_test_template extends: .example_test_template

2
tools/ci/test_build_system.sh
View File

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

2
tools/ci/test_build_system_cmake.sh
View File

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