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

CI: Minor changes in code formatting and cleanup

Browse Source
This commit is contained in:
Anton Maklakov
2017-06-09 18:14:29 +08:00
parent 3f8e58a637
commit e334b7267e
1 changed files with 36 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
.gitlab-ci.yml
View File

@@ -36,12 +36,10 @@ build_template_app:
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env
tags: tags:
- build - build
variables: variables:
GIT_STRATEGY: clone GIT_STRATEGY: clone
BATCH_BUILD: "1" BATCH_BUILD: "1"
IDF_CI_BUILD: "1" IDF_CI_BUILD: "1"
script: script:
- git clone https://github.com/espressif/esp-idf-template.git - git clone https://github.com/espressif/esp-idf-template.git
- cd esp-idf-template - cd esp-idf-template
@@ -66,7 +64,6 @@ build_template_app:
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env
tags: tags:
- build - build
variables: variables:
GIT_STRATEGY: clone GIT_STRATEGY: clone
BATCH_BUILD: "1" BATCH_BUILD: "1"
@@ -76,9 +73,8 @@ build_ssc:
<<: *build_template <<: *build_template
artifacts: artifacts:
paths: paths:
- ./SSC/ssc_bin - SSC/ssc_bin
expire_in: 6 mos expire_in: 6 mos
script: script:
- git clone $SSC_REPOSITORY - git clone $SSC_REPOSITORY
- cd SSC - cd SSC
@@ -98,15 +94,14 @@ build_esp_idf_tests:
<<: *build_template <<: *build_template
artifacts: artifacts:
paths: paths:
- ./tools/unit-test-app/build/*.bin - tools/unit-test-app/build/*.bin
- ./tools/unit-test-app/build/*.elf - tools/unit-test-app/build/*.elf
- ./tools/unit-test-app/build/*.map - tools/unit-test-app/build/*.map
- ./tools/unit-test-app/build/download.config - tools/unit-test-app/build/download.config
- ./tools/unit-test-app/build/bootloader/*.bin - tools/unit-test-app/build/bootloader/*.bin
- ./components/idf_test/unit_test/TestCaseAll.yml - components/idf_test/unit_test/TestCaseAll.yml
- ./components/idf_test/unit_test/CIConfigs/*.yml - components/idf_test/unit_test/CIConfigs/*.yml
expire_in: 6 mos expire_in: 6 mos
script: script:
- cd tools/unit-test-app - cd tools/unit-test-app
- make TESTS_ALL=1 - make TESTS_ALL=1
@@ -154,6 +149,10 @@ build_docs:
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env
tags: tags:
- build_docs - build_docs
artifacts:
paths:
- docs/_build/html
expire_in: 1 mos
script: script:
- cd docs - cd docs
- doxygen - doxygen
@@ -161,10 +160,6 @@ build_docs:
- test -n $IS_PRIVATE && test $(cat doxygen-warning-log.txt | wc -l) -eq 0 || ( echo "Doxygen pass had some warnings:" && cat doxygen-warning-log.txt && false ) - test -n $IS_PRIVATE && test $(cat doxygen-warning-log.txt | wc -l) -eq 0 || ( echo "Doxygen pass had some warnings:" && cat doxygen-warning-log.txt && false )
- make gh-linkcheck - make gh-linkcheck
- make html - make html
artifacts:
paths:
- docs/_build/html
expire_in: 1 mos
test_nvs_on_host: test_nvs_on_host:
stage: test stage: test
@@ -250,7 +245,7 @@ test_report:
- python CITestReport.py -l $LOG_PATH -t $TEST_CASE_FILE_PATH -p $REPORT_PATH -r $RESULT_PATH -a $ARTIFACTS_PATH -m $MODULE_UPDATE_FILE || TEST_RESULT=Fail - python CITestReport.py -l $LOG_PATH -t $TEST_CASE_FILE_PATH -p $REPORT_PATH -r $RESULT_PATH -a $ARTIFACTS_PATH -m $MODULE_UPDATE_FILE || TEST_RESULT=Fail
# commit to CI-test-result project # commit to CI-test-result project
- git clone $GITLAB_SSH_SERVER/qa/CI-test-result.git - git clone $GITLAB_SSH_SERVER/qa/CI-test-result.git
- rm -rf CI-test-result/RawData/$RESULT_PATH - rm -rf "CI-test-result/RawData/$RESULT_PATH"
- cp -R $CI_PROJECT_NAME CI-test-result/RawData - cp -R $CI_PROJECT_NAME CI-test-result/RawData
- cd CI-test-result - cd CI-test-result
# config git user # config git user
@@ -329,6 +324,10 @@ check_doc_links:
only: only:
# can only be triggered # can only be triggered
- triggers - triggers
artifacts:
paths:
- docs/_build/linkcheck
expire_in: 1 mos
script: script:
# must be triggered with CHECK_LINKS=Yes, otherwise exit without test # must be triggered with CHECK_LINKS=Yes, otherwise exit without test
- test "$CHECK_LINKS" = "Yes" || exit 0 - test "$CHECK_LINKS" = "Yes" || exit 0
@@ -336,10 +335,6 @@ check_doc_links:
- test "${CI_COMMIT_REF_NAME}" = "master" || exit 0 - test "${CI_COMMIT_REF_NAME}" = "master" || exit 0
- cd docs - cd docs
- make linkcheck - make linkcheck
artifacts:
paths:
- docs/_build/linkcheck
expire_in: 1 mos
check_commit_msg: check_commit_msg:
stage: deploy stage: deploy
@@ -386,7 +381,6 @@ assign_test:
- components/idf_test/*/CIConfigs - components/idf_test/*/CIConfigs
- components/idf_test/*/TC.sqlite - components/idf_test/*/TC.sqlite
expire_in: 1 mos expire_in: 1 mos
script: script:
# first move test bins together: test_bins/CHIP_SDK/TestApp/bin_files # first move test bins together: test_bins/CHIP_SDK/TestApp/bin_files
- mkdir -p test_bins/ESP32_IDF/UT - mkdir -p test_bins/ESP32_IDF/UT
@@ -402,6 +396,8 @@ assign_test:
- python CIAssignTestCases.py -t $IDF_PATH/components/idf_test/integration_test -c $IDF_PATH/.gitlab-ci.yml -b $IDF_PATH/test_bins - python CIAssignTestCases.py -t $IDF_PATH/components/idf_test/integration_test -c $IDF_PATH/.gitlab-ci.yml -b $IDF_PATH/test_bins
.test_template: &test_template .test_template: &test_template
before_script:
- echo "Skip cloning submodule here"
stage: test stage: test
when: on_success when: on_success
only: only:
@@ -410,10 +406,13 @@ assign_test:
- /^v\d+\.\d+(\.\d+)?($|-)/ - /^v\d+\.\d+(\.\d+)?($|-)/
- triggers - triggers
allow_failure: true allow_failure: true
dependencies: dependencies:
- assign_test - assign_test
artifacts:
when: always
paths:
- $LOG_PATH
expire_in: 6 mos
variables: variables:
# set git strategy to fetch so we can get esptool without update submodule # set git strategy to fetch so we can get esptool without update submodule
GIT_STRATEGY: fetch GIT_STRATEGY: fetch
@@ -422,21 +421,11 @@ assign_test:
TEST_CASE_FILE_PATH: "$CI_PROJECT_DIR/components/idf_test/integration_test" TEST_CASE_FILE_PATH: "$CI_PROJECT_DIR/components/idf_test/integration_test"
MODULE_UPDATE_FILE: "$CI_PROJECT_DIR/components/idf_test/ModuleDefinition.yml" MODULE_UPDATE_FILE: "$CI_PROJECT_DIR/components/idf_test/ModuleDefinition.yml"
CONFIG_FILE: "$CI_PROJECT_DIR/components/idf_test/integration_test/CIConfigs/$CI_JOB_NAME.yml" CONFIG_FILE: "$CI_PROJECT_DIR/components/idf_test/integration_test/CIConfigs/$CI_JOB_NAME.yml"
artifacts:
when: always
paths:
- $LOG_PATH
expire_in: 6 mos
before_script:
- echo "Skip cloning submodule here"
script: script:
# first test if config file exists, if not exist, exit 0 # first test if config file exists, if not exist, exit 0
- test -e $CONFIG_FILE || exit 0 - test -e $CONFIG_FILE || exit 0
# remove artifacts from last stage (UT logs) # remove artifacts from the 'unit_test' stage
- rm -rf $LOG_PATH - rm -rf "$LOG_PATH"
# add gitlab ssh key # add gitlab ssh key
- mkdir -p ~/.ssh - mkdir -p ~/.ssh
- chmod 700 ~/.ssh - chmod 700 ~/.ssh
@@ -458,7 +447,6 @@ assign_test:
<<: *test_template <<: *test_template
allow_failure: false allow_failure: false
stage: unit_test stage: unit_test
variables: variables:
GIT_STRATEGY: fetch GIT_STRATEGY: fetch
LOCAL_ENV_CONFIG_PATH: "$CI_PROJECT_DIR/ci-test-runner-configs/$CI_RUNNER_DESCRIPTION/ESP32_IDF" LOCAL_ENV_CONFIG_PATH: "$CI_PROJECT_DIR/ci-test-runner-configs/$CI_RUNNER_DESCRIPTION/ESP32_IDF"
@@ -473,14 +461,14 @@ nvs_compatible_test:
when: always when: always
paths: paths:
- $LOG_PATH - $LOG_PATH
- $IDF_PATH/nvs_wifi.bin - nvs_wifi.bin
expire_in: 6 mos expire_in: 6 mos
tags: tags:
- ESP32_IDF - ESP32_IDF
- NVS_Compatible - NVS_Compatible
script: script:
# remove artifacts from last stage (UT logs) # remove artifacts from the 'unit_test' stage
- rm -rf $LOG_PATH - rm -rf "$LOG_PATH"
# add gitlab ssh key # add gitlab ssh key
- mkdir -p ~/.ssh - mkdir -p ~/.ssh
- chmod 700 ~/.ssh - chmod 700 ~/.ssh
@@ -534,43 +522,43 @@ IT_001_02:
tags: tags:
- ESP32_IDF - ESP32_IDF
- SSC_T1_1 - SSC_T1_1
IT_001_03: IT_001_03:
<<: *test_template <<: *test_template
tags: tags:
- ESP32_IDF - ESP32_IDF
- SSC_T1_1 - SSC_T1_1
IT_001_04: IT_001_04:
<<: *test_template <<: *test_template
tags: tags:
- ESP32_IDF - ESP32_IDF
- SSC_T1_1 - SSC_T1_1
IT_001_05: IT_001_05:
<<: *test_template <<: *test_template
tags: tags:
- ESP32_IDF - ESP32_IDF
- SSC_T1_1 - SSC_T1_1
IT_001_06: IT_001_06:
<<: *test_template <<: *test_template
tags: tags:
- ESP32_IDF - ESP32_IDF
- SSC_T1_1 - SSC_T1_1
IT_001_07: IT_001_07:
<<: *test_template <<: *test_template
tags: tags:
- ESP32_IDF - ESP32_IDF
- SSC_T1_1 - SSC_T1_1
IT_001_08: IT_001_08:
<<: *test_template <<: *test_template
tags: tags:
- ESP32_IDF - ESP32_IDF
- SSC_T1_1 - SSC_T1_1
IT_002_01: IT_002_01:
<<: *test_template <<: *test_template
tags: tags: