summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Bettis <jbettis@google.com>2023-01-11 13:36:44 -0700
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2023-01-11 21:59:22 +0000
commita6f634403f55da80e677578d689e906d25b405c2 (patch)
treeaed3c41d9c17003a27910408f82345d1c7a401c4
parent2348db445c49ff33f032d5a59b6ee76c79359a42 (diff)
downloadchrome-ec-a6f634403f55da80e677578d689e906d25b405c2.tar.gz
gitlab: Disable upstream coverage reports
Downloading the zephyr coverage data from codecov.io isn't working. Disable twister_coverage job and comment out the steps that depend on it. BRANCH=None BUG=None TEST=Validated yaml at https://gitlab.com/zephyr-ec/ec/-/ci/editor?branch_name=main&tab=2 Change-Id: I0c70b8124de073c9570c0e94a1758d2f2103c0a9 Signed-off-by: Jeremy Bettis <jbettis@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4156999 Commit-Queue: Jeremy Bettis <jbettis@chromium.org> Commit-Queue: Simon Glass <sjg@chromium.org> Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com> Reviewed-by: Tristan Honscheid <honscheid@google.com> Tested-by: Jeremy Bettis <jbettis@chromium.org> Auto-Submit: Jeremy Bettis <jbettis@chromium.org> Reviewed-by: Yuval Peress <peress@google.com> Reviewed-by: Simon Glass <sjg@chromium.org>
-rw-r--r--.gitlab-ci.yml90
1 files changed, 47 insertions, 43 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a0848a8779..1dc1cf7ead 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -122,29 +122,32 @@ before_script:
# merged_coverage
.coverage_template: &coverage_template
stage: test
- needs: ["merged_coverage", "zephyr_coverage", "twister_coverage"]
+ needs:
+ - "merged_coverage"
+ - "zephyr_coverage"
+ # - "twister_coverage"
script:
- cd ${EC_DIR}
- zmake --zephyr-base "${ZEPHYR_BASE}"
--modules-dir "${MODULES_DIR}" -l DEBUG build --coverage
-B "${BUILD_DIR}" -t ${TOOLCHAIN:-zephyr}
"${PROJECT}"
- - lcov --rc lcov_branch_coverage=1
- -o "${BUILD_DIR}/${PROJECT}/output/merged_twister.info"
- -a "${BUILD_DIR}/${PROJECT}/output/zephyr.info"
- -a "${BUILD_DIR}/zephyr_codecov/fixed.info"
- - lcov --rc lcov_branch_coverage=1
- -o "${BUILD_DIR}/${PROJECT}/output/merged_twister_no_ec.info"
- -e "${BUILD_DIR}/${PROJECT}/output/merged_twister.info"
- "${ZEPHYR_BASE}/**" "${MODULES_DIR}/**"
- - grep "SF:" "${BUILD_DIR}/${PROJECT}/output/zephyr.info" | sort -u |
- sed -e 's|^SF:||' | xargs lcov --rc lcov_branch_coverage=1
- -o "${BUILD_DIR}/${PROJECT}/output/filtered_twister.info"
- -e "${BUILD_DIR}/${PROJECT}/output/merged_twister_no_ec.info"
- - /usr/bin/genhtml --branch-coverage -q
- -o "${BUILD_DIR}/${PROJECT}/output/filtered_twister_rpt"
- -t "${PROJECT} coverage of twister tests"
- -s "${BUILD_DIR}/${PROJECT}/output/filtered_twister.info"
+ # - lcov --rc lcov_branch_coverage=1
+ # -o "${BUILD_DIR}/${PROJECT}/output/merged_twister.info"
+ # -a "${BUILD_DIR}/${PROJECT}/output/zephyr.info"
+ # -a "${BUILD_DIR}/zephyr_codecov/fixed.info"
+ # - lcov --rc lcov_branch_coverage=1
+ # -o "${BUILD_DIR}/${PROJECT}/output/merged_twister_no_ec.info"
+ # -e "${BUILD_DIR}/${PROJECT}/output/merged_twister.info"
+ # "${ZEPHYR_BASE}/**" "${MODULES_DIR}/**"
+ # - grep "SF:" "${BUILD_DIR}/${PROJECT}/output/zephyr.info" | sort -u |
+ # sed -e 's|^SF:||' | xargs lcov --rc lcov_branch_coverage=1
+ # -o "${BUILD_DIR}/${PROJECT}/output/filtered_twister.info"
+ # -e "${BUILD_DIR}/${PROJECT}/output/merged_twister_no_ec.info"
+ # - /usr/bin/genhtml --branch-coverage -q
+ # -o "${BUILD_DIR}/${PROJECT}/output/filtered_twister_rpt"
+ # -t "${PROJECT} coverage of twister tests"
+ # -s "${BUILD_DIR}/${PROJECT}/output/filtered_twister.info"
- lcov --rc lcov_branch_coverage=1 -o "${BUILD_DIR}/${PROJECT}/output/merged.info"
-a "${BUILD_DIR}/${PROJECT}/output/zephyr.info"
-a "${BUILD_DIR}/merged.info"
@@ -385,32 +388,33 @@ testall:
- python3 ${EC_DIR}/twister --outdir "${TWISTER_OUT_DIR}" -v -i
-x=ALLOW_WARNINGS=ON
-twister_coverage:
- stage: test
- needs: []
- script:
- - mkdir -p ${BUILD_DIR}/zephyr_codecov
- - for commitid in $(cd "${ZEPHYR_BASE}" ; git fetch --depth=100 ; git log | awk '/GitOrigin-RevId:/ {print $2}') ; do
- echo "COMMITID = ${commitid?}" ;
- if wget -O /tmp/coverage.html "https://codecov.io/gh/zephyrproject-rtos/zephyr/commit/${commitid?}/build" ; then
- downloadurl=$(sed -e '/download\/build/!d' -e 's|^.*href="|https://codecov.io|' -e 's|".*$||' /tmp/coverage.html | head -1) ;
- echo "DOWNLOADURL = ${downloadurl?}" ;
- wget -O ${BUILD_DIR}/zephyr_codecov/merged.info.raw "${downloadurl?}" ;
- sed <${BUILD_DIR}/zephyr_codecov/merged.info.raw >${BUILD_DIR}/zephyr_codecov/merged.info
- -e '1,/<<<<<< network/d' -e '/<<<<<< EOF/,$d' ;
- sed <${BUILD_DIR}/zephyr_codecov/merged.info >${BUILD_DIR}/zephyr_codecov/fixed.info
- -e "s|/__w/zephyr/zephyr|${ZEPHYR_BASE}|"
- -e "s|/__w/zephyr/modules/hal/cmsis|${MODULES_DIR}/cmsis|"
- -e "s|/__w/zephyr/modules|${MODULES_DIR}|" ;
- break ;
- fi ;
- done
- - lcov --rc lcov_branch_coverage=1 --summary ${BUILD_DIR}/zephyr_codecov/fixed.info
- artifacts:
- paths:
- - ec_dir/build/zephyr_codecov/fixed.info
- expire_in: 1 week
- coverage: '/lines\.*: \d+\.\d+%/'
+# The download url changed. Disable until we can figure it out.
+# twister_coverage:
+# stage: test
+# needs: []
+# script:
+# - mkdir -p ${BUILD_DIR}/zephyr_codecov
+# - for commitid in $(cd "${ZEPHYR_BASE}" ; git fetch --depth=100 ; git log | awk '/GitOrigin-RevId:/ {print $2}') ; do
+# echo "COMMITID = ${commitid?}" ;
+# if wget -O /tmp/coverage.html "https://app.codecov.io/gh/zephyrproject-rtos/zephyr/commit/${commitid?}" ; then
+# downloadurl=$(sed -e '/download\/build/!d' -e 's|^.*href="|https://codecov.io|' -e 's|".*$||' /tmp/coverage.html | head -1) ;
+# echo "DOWNLOADURL = ${downloadurl?}" ;
+# wget -O ${BUILD_DIR}/zephyr_codecov/merged.info.raw "${downloadurl?}" ;
+# sed <${BUILD_DIR}/zephyr_codecov/merged.info.raw >${BUILD_DIR}/zephyr_codecov/merged.info
+# -e '1,/<<<<<< network/d' -e '/<<<<<< EOF/,$d' ;
+# sed <${BUILD_DIR}/zephyr_codecov/merged.info >${BUILD_DIR}/zephyr_codecov/fixed.info
+# -e "s|/__w/zephyr/zephyr|${ZEPHYR_BASE}|"
+# -e "s|/__w/zephyr/modules/hal/cmsis|${MODULES_DIR}/cmsis|"
+# -e "s|/__w/zephyr/modules|${MODULES_DIR}|" ;
+# break ;
+# fi ;
+# done
+# - lcov --rc lcov_branch_coverage=1 --summary ${BUILD_DIR}/zephyr_codecov/fixed.info
+# artifacts:
+# paths:
+# - ec_dir/build/zephyr_codecov/fixed.info
+# expire_in: 1 week
+# coverage: '/lines\.*: \d+\.\d+%/'
zmake_coverage:
stage: test