You are viewing a plain text version of this content. The canonical link for it is here.
Posted to gitbox@yetus.apache.org by aw...@apache.org on 2020/10/19 16:33:08 UTC
[yetus] branch main updated: YETUS-1005. Update Cirrus CI Support
(#164)
This is an automated email from the ASF dual-hosted git repository.
aw pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/yetus.git
The following commit(s) were added to refs/heads/main by this push:
new c8cd03a YETUS-1005. Update Cirrus CI Support (#164)
c8cd03a is described below
commit c8cd03a4963f18804fa5415307ab79fccc3d7f4f
Author: Allen Wittenauer <aw...@apache.org>
AuthorDate: Mon Oct 19 09:32:58 2020 -0700
YETUS-1005. Update Cirrus CI Support (#164)
---
.cirrus.yml | 12 +++++++-----
precommit/src/main/shell/robots.d/cirrusci.sh | 8 ++++----
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/.cirrus.yml b/.cirrus.yml
index 6d1c149..fe84b31 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -20,18 +20,20 @@ yetus_task:
image: apache/yetus:main
test_script: >
${CIRRUS_WORKING_DIR}/precommit/src/main/shell/test-patch.sh
- --plugins=all
- --pylint=pylint2
- --java-home=/usr/lib/jvm/java-8-openjdk-amd64
--basedir="${CIRRUS_WORKING_DIR}"
- --html-report-file=/tmp/yetus-out/report.html
- --console-report-file=/tmp/yetus-out/console.txt
--brief-report-file=/tmp/yetus-out/brief.txt
--bugcomments=briefreport,htmlout,junit
+ --console-report-file=/tmp/yetus-out/console.txt
+ --html-report-file=/tmp/yetus-out/report.html
+ --java-home=/usr/lib/jvm/java-8-openjdk-amd64
+ --junit-report-xml=/tmp/yetus-out/junit.xml
+ --plugins=all
+ --pylint=pylint2
--tests-filter=checkstyle,javadoc,rubocop,test4tests
always:
junit_artifacts:
path: "yetus-out/junit.xml"
+ type: text/xml
format: junit
other_artifacts:
path: "yetus-out/**"
diff --git a/precommit/src/main/shell/robots.d/cirrusci.sh b/precommit/src/main/shell/robots.d/cirrusci.sh
index 56de9f9..cd4b7c0 100755
--- a/precommit/src/main/shell/robots.d/cirrusci.sh
+++ b/precommit/src/main/shell/robots.d/cirrusci.sh
@@ -18,6 +18,7 @@
if [[ "${CIRRUS_CI}" == true ]] &&
declare -f compile_cycle >/dev/null; then
+
# shellcheck disable=SC2034
ROBOT=true
# shellcheck disable=SC2034
@@ -30,7 +31,6 @@ if [[ "${CIRRUS_CI}" == true ]] &&
# shellcheck disable=SC2034
RELOCATE_PATCH_DIR=true
-
# shellcheck disable=SC2034
if [[ "${CIRRUS_PR}" == false ]]; then
# shellcheck disable=SC2034
@@ -50,13 +50,13 @@ if [[ "${CIRRUS_CI}" == true ]] &&
CI \
CIRRUS_BASE_SHA \
CIRRUS_BRANCH \
- CIRRUS_BUILD_ID
CIRRUS_BUILD_ID \
CIRRUS_CI \
CIRRUS_DEFAULT_BRANCH \
CIRRUS_PR \
CIRRUS_REPO_FULL_NAME \
- CIRRUS_TASK_ID
+ CIRRUS_TASK_ID \
+ GITHUB_CHECK_SUITE_ID
# shellcheck disable=SC2034
GIT_BRANCH_SHA=${CIRRUS_BASE_SHA}
@@ -99,4 +99,4 @@ function cirrusci_artifact_url
dir=${PATCH_DIR##*/}
echo "https://api.cirrus-ci.com/v1/artifact/task/${CIRRUS_TASK_ID}/other/${dir}"
-}
\ No newline at end of file
+}