From c2d261c88eea61cdb1490c0fbf623e7870f84220 Mon Sep 17 00:00:00 2001 From: Anton Maklakov Date: Thu, 25 Jun 2020 12:52:00 +0700 Subject: [PATCH] ci: use the retry script to download --- tools/ci/config/assign-test.yml | 4 ++-- tools/ci/config/build.yml | 4 ++-- tools/ci/config/deploy.yml | 2 +- tools/ci/config/host-test.yml | 2 +- tools/ci/config/target-test.yml | 12 ++++++------ 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/ci/config/assign-test.yml b/tools/ci/config/assign-test.yml index e997062e3..63e2f84db 100644 --- a/tools/ci/config/assign-test.yml +++ b/tools/ci/config/assign-test.yml @@ -32,7 +32,7 @@ assign_test: # assign unit test cases - python tools/ci/python_packages/ttfw_idf/CIAssignUnitTest.py $UNIT_TEST_CASE_FILE $CI_TARGET_TEST_CONFIG_FILE $IDF_PATH/components/idf_test/unit_test/CIConfigs # clone test script to assign tests - - git clone $TEST_SCRIPT_REPOSITORY + - ./tools/ci/retry_failed.sh git clone $TEST_SCRIPT_REPOSITORY - python $CHECKOUT_REF_SCRIPT auto_test_script auto_test_script - cd auto_test_script # assgin integration test cases @@ -63,7 +63,7 @@ update_test_cases: PYTHON_VER: 3 script: - export GIT_SHA=$(echo ${CI_COMMIT_SHA} | cut -c 1-8) - - git clone $TEST_MANAGEMENT_REPO + - ./tools/ci/retry_failed.sh git clone $TEST_MANAGEMENT_REPO - python $CHECKOUT_REF_SCRIPT test-management test-management - cd test-management - echo $BOT_JIRA_ACCOUNT > ${BOT_ACCOUNT_CONFIG_FILE} diff --git a/tools/ci/config/build.yml b/tools/ci/config/build.yml index 69e89f7b9..0c644001f 100644 --- a/tools/ci/config/build.yml +++ b/tools/ci/config/build.yml @@ -37,7 +37,7 @@ build_template_app: script: # Set the variable for 'esp-idf-template' testing - ESP_IDF_TEMPLATE_GIT=${ESP_IDF_TEMPLATE_GIT:-"https://github.com/espressif/esp-idf-template.git"} - - git clone ${ESP_IDF_TEMPLATE_GIT} + - ./tools/ci/retry_failed.sh git clone ${ESP_IDF_TEMPLATE_GIT} - python $CHECKOUT_REF_SCRIPT esp-idf-template esp-idf-template - cd esp-idf-template # Try to use the same branch name for esp-idf-template that we're @@ -72,7 +72,7 @@ build_ssc: - $BOT_LABEL_INTEGRATION_TEST - $BOT_LABEL_REGULAR_TEST script: - - git clone $SSC_REPOSITORY + - ./tools/ci/retry_failed.sh git clone $SSC_REPOSITORY - python $CHECKOUT_REF_SCRIPT SSC SSC - cd SSC - MAKEFLAGS= ./ci_build_ssc.sh diff --git a/tools/ci/config/deploy.yml b/tools/ci/config/deploy.yml index 4964e388b..c6a8c91a9 100644 --- a/tools/ci/config/deploy.yml +++ b/tools/ci/config/deploy.yml @@ -150,7 +150,7 @@ deploy_test_result: # artifacts of job update_test_cases creates test-management folder # we need to remove it so we can clone test-management folder again - rm -r test-management - - git clone $TEST_MANAGEMENT_REPO + - ./tools/ci/retry_failed.sh git clone $TEST_MANAGEMENT_REPO - python3 $CHECKOUT_REF_SCRIPT test-management test-management - cd test-management - echo $BOT_JIRA_ACCOUNT > ${BOT_ACCOUNT_CONFIG_FILE} diff --git a/tools/ci/config/host-test.yml b/tools/ci/config/host-test.yml index b6ee4aa85..6463d1535 100644 --- a/tools/ci/config/host-test.yml +++ b/tools/ci/config/host-test.yml @@ -50,7 +50,7 @@ - $IDF_PATH/examples/get-started/hello_world/tidybuild/report/* expire_in: 1 day script: - - git clone $IDF_ANALYSIS_UTILS static_analysis_utils && cd static_analysis_utils + - ./tools/ci/retry_failed.sh git clone $IDF_ANALYSIS_UTILS static_analysis_utils && cd static_analysis_utils # Setup parameters of triggered/regular job - export TRIGGERED_RELATIVE=${BOT_LABEL_STATIC_ANALYSIS-} && export TRIGGERED_ABSOLUTE=${BOT_LABEL_STATIC_ANALYSIS_ALL-} && export TARGET_BRANCH=${BOT_CUSTOMIZED_REVISION-} - ./analyze.sh $IDF_PATH/examples/get-started/hello_world/ $IDF_PATH/tools/ci/static-analysis-rules.yml $IDF_PATH/output.xml diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml index 9fb302920..8b573597b 100644 --- a/tools/ci/config/target-test.yml +++ b/tools/ci/config/target-test.yml @@ -39,7 +39,7 @@ # first test if config file exists, if not exist, exit 0 - test -e $CONFIG_FILE || exit 0 # clone test env configs - - git clone $TEST_ENV_CONFIG_REPOSITORY + - ./tools/ci/retry_failed.sh git clone $TEST_ENV_CONFIG_REPOSITORY - python $CHECKOUT_REF_SCRIPT ci-test-runner-configs ci-test-runner-configs - cd tools/ci/python_packages/tiny_test_fw/bin # run test @@ -105,10 +105,10 @@ # first test if config file exists, if not exist, exit 0 - test -e $CONFIG_FILE || exit 0 # clone local test env configs - - git clone $TEST_ENV_CONFIG_REPOSITORY + - ./tools/ci/retry_failed.sh git clone $TEST_ENV_CONFIG_REPOSITORY - python $CHECKOUT_REF_SCRIPT ci-test-runner-configs ci-test-runner-configs # clone test bench - - git clone $TEST_SCRIPT_REPOSITORY + - ./tools/ci/retry_failed.sh git clone $TEST_SCRIPT_REPOSITORY - python $CHECKOUT_REF_SCRIPT auto_test_script auto_test_script - cd auto_test_script # run test @@ -163,7 +163,7 @@ example_test_002: # first test if config file exists, if not exist, exit 0 - test -e $CONFIG_FILE || exit 0 # clone test env configs - - git clone $TEST_ENV_CONFIG_REPOSITORY + - ./tools/ci/retry_failed.sh git clone $TEST_ENV_CONFIG_REPOSITORY - python $CHECKOUT_REF_SCRIPT ci-test-runner-configs ci-test-runner-configs - cd tools/ci/python_packages/tiny_test_fw/bin # run test @@ -407,10 +407,10 @@ nvs_compatible_test: # first test if config file exists, if not exist, exit 0 - test -e $CONFIG_FILE || exit 0 # clone local test env configs - - git clone $TEST_ENV_CONFIG_REPOSITORY + - ./tools/ci/retry_failed.sh git clone $TEST_ENV_CONFIG_REPOSITORY - python $CHECKOUT_REF_SCRIPT ci-test-runner-configs ci-test-runner-configs # clone test bench - - git clone $TEST_SCRIPT_REPOSITORY + - ./tools/ci/retry_failed.sh git clone $TEST_SCRIPT_REPOSITORY - python $CHECKOUT_REF_SCRIPT auto_test_script auto_test_script - cd auto_test_script # prepare nvs bins