From 34b677d03b7e2877cf6753b6fde3ba4758258a57 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 | 2 +- tools/ci/config/deploy.yml | 2 +- tools/ci/config/host-test.yml | 2 +- tools/ci/config/pre_check.yml | 2 +- tools/ci/config/target-test.yml | 14 +++++++------- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/ci/config/assign-test.yml b/tools/ci/config/assign-test.yml index 3003ee4fda..5313e547b9 100644 --- a/tools/ci/config/assign-test.yml +++ b/tools/ci/config/assign-test.yml @@ -39,7 +39,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 @@ -70,7 +70,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 6170c73b71..4a6b41df96 100644 --- a/tools/ci/config/build.yml +++ b/tools/ci/config/build.yml @@ -23,7 +23,7 @@ - $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 $TARGET_NAME diff --git a/tools/ci/config/deploy.yml b/tools/ci/config/deploy.yml index bc405a2204..8f7909c8a9 100644 --- a/tools/ci/config/deploy.yml +++ b/tools/ci/config/deploy.yml @@ -177,7 +177,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 -rf 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 7cff3fc6cb..30488755d9 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/pre_check.yml b/tools/ci/config/pre_check.yml index 89f50ed748..cc89f17010 100644 --- a/tools/ci/config/pre_check.yml +++ b/tools/ci/config/pre_check.yml @@ -132,7 +132,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} # Try to use the same branch name for esp-idf-template that we're # using on esp-idf. If it doesn't exist then just stick to the default branch - python $CHECKOUT_REF_SCRIPT esp-idf-template esp-idf-template diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml index e9e77ab0f1..539aa5126b 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 @@ -77,7 +77,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 @@ -164,10 +164,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 @@ -240,7 +240,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 @@ -612,10 +612,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