From e84c646d70e496caa7a0cbc1d9c7a7d909e5f876 Mon Sep 17 00:00:00 2001 From: Allen Wittenauer Date: Fri, 24 Apr 2026 22:23:56 -0700 Subject: [PATCH 1/2] YETUS-1272. Remove Cirrus CI --- .cirrus.yml | 40 ------- .../precommit/robots/cirrusci.html.md | 51 --------- precommit/src/main/shell/robots.d/cirrusci.sh | 105 ------------------ 3 files changed, 196 deletions(-) delete mode 100644 .cirrus.yml delete mode 100644 asf-site-src/source/documentation/in-progress/precommit/robots/cirrusci.html.md delete mode 100755 precommit/src/main/shell/robots.d/cirrusci.sh diff --git a/.cirrus.yml b/.cirrus.yml deleted file mode 100644 index 086c27440..000000000 --- a/.cirrus.yml +++ /dev/null @@ -1,40 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - ---- - -yetus_task: - container: - image: ghcr.io/apache/yetus:main - test_script: > - ${CIRRUS_WORKING_DIR}/precommit/src/main/shell/test-patch.sh - --basedir="${CIRRUS_WORKING_DIR}" - --brief-report-file=/tmp/yetus-out/brief.txt - --bugcomments=briefreport,console,csvout,htmlout,junit - --console-report-file=/tmp/yetus-out/console.txt - --csv-report-file=/tmp/yetus-out/report.csv - --html-report-file=/tmp/yetus-out/report.html - --java-home=/usr/lib/jvm/java-11-openjdk-amd64 - --junit-report-xml=/tmp/yetus-out/junit.xml - --plugins=all - --junit-report-xml=line - --tests-filter=checkstyle,test4tests - always: - junit_artifacts: - path: "yetus-out/junit.xml" - type: text/xml - format: junit - other_artifacts: - path: "yetus-out/**" diff --git a/asf-site-src/source/documentation/in-progress/precommit/robots/cirrusci.html.md b/asf-site-src/source/documentation/in-progress/precommit/robots/cirrusci.html.md deleted file mode 100644 index de135e195..000000000 --- a/asf-site-src/source/documentation/in-progress/precommit/robots/cirrusci.html.md +++ /dev/null @@ -1,51 +0,0 @@ - - -# Robots: Cirrus CI - -TRIGGER: ${CIRRUS_CI}=true - -`--patch-dir` will be configured to be `/tmp/yetus-out` and will be moved to the `yetus-out` directory in the source tree after completion. Adding this stanza to your `.cirrus.yml` file will upload and store those components for a week in Gitlab CI's artifact retrieval system: - -```yaml ---- - always: - junit_artifacts: - path: "yetus-out/junit.xml" - format: junit - other_artifacts: - path: "yetus-out/**" -``` - -To use the `--patch-dir` for additional output, use the `/tmp/yetus-out` path. For example: `--html-report-file=/tmp/yetus-out/report.html`. - -To use the pre-built Apache Yetus Docker image from docker hub as the build environment, use the following snippet in the `.cirrus.yml` file, substituting the tag for the version of Apache Yetus that should be used and replacing the `JAVA_HOME` with the appropriate version as bundled mentioned in the Dockerfile: - -```yaml ---- -yetus_task: - container: - image: apache/yetus:0.10.0 - - ... -``` - -See also: - -* Apache Yetus' source tree [.cirrus.yml](https://github.com/apache/yetus/blob/main/.cirrus.yml) for some tips and tricks. diff --git a/precommit/src/main/shell/robots.d/cirrusci.sh b/precommit/src/main/shell/robots.d/cirrusci.sh deleted file mode 100755 index 66f5ddc4b..000000000 --- a/precommit/src/main/shell/robots.d/cirrusci.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/usr/bin/env bash -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# SHELLDOC-IGNORE - -if [[ "${CIRRUS_CI}" == true ]] && - declare -f compile_cycle >/dev/null; then - - # shellcheck disable=SC2034 - ROBOT=true - # shellcheck disable=SC2034 - PATCH_BRANCH_DEFAULT=${CIRRUS_DEFAULT_BRANCH} - # shellcheck disable=SC2034 - INSTANCE=${CIRRUS_BUILD_ID} - # shellcheck disable=SC2034 - ROBOTTYPE=cirrusci - PATCH_DIR=/tmp/yetus-out - # shellcheck disable=SC2034 - RELOCATE_PATCH_DIR=true - - # shellcheck disable=SC2034 - if [[ "${CIRRUS_PR}" == false ]]; then - # shellcheck disable=SC2034 - BUILDMODE='patch' - # shellcheck disable=SC2034 - PATCH_OR_ISSUE=GH:${CIRRUS_PR} - USER_PARAMS+=("GH:${CIRRUS_PR}") - else - BUILDMODE=full - PATCH_BRANCH=${CIRRUS_BRANCH} - fi - - # shellcheck disable=SC2034 - GITHUB_REPO=${CIRRUS_REPO_FULL_NAME} - - add_docker_env \ - CI \ - CIRRUS_BASE_SHA \ - CIRRUS_BRANCH \ - CIRRUS_BUILD_ID \ - CIRRUS_CI \ - CIRRUS_DEFAULT_BRANCH \ - CIRRUS_PR \ - CIRRUS_REPO_FULL_NAME \ - CIRRUS_TASK_ID \ - GITHUB_CHECK_SUITE_ID - - # shellcheck disable=SC2034 - GIT_BRANCH_SHA=${CIRRUS_BASE_SHA} - - # shellcheck disable=SC2034 - BUILD_URL="https://cirrus-ci.com/task/${CIRRUS_TASK_ID}" - - # shellcheck disable=SC2034 - BUILD_URL_CONSOLE="" - # shellcheck disable=SC2034 - CONSOLE_USE_BUILD_URL=true - - if [[ -d ${BASEDIR}/.git ]]; then - - check_basedir_repo - - echo "Updating the local git repo to include all branches/tags:" - pushd "${BASEDIR}" >/dev/null || exit 1 - "${GIT}" config --replace-all remote.origin.fetch +refs/heads/*:refs/remotes/origin/* - "${GIT}" fetch --tags - popd >/dev/null || exit 1 - fi - - yetus_add_array_element EXEC_MODES CirrusCI -fi - -function cirrusci_set_plugin_defaults -{ - # shellcheck disable=SC2034 - GITHUB_REPO=${CIRRUS_REPO_FULL_NAME} - # shellcheck disable=SC2034 - JUNIT_RESULTS_XML="${PATCH_DIR}/junit.xml" -} - -function cirrusci_finalreport -{ - add_footer_table "Console output" "${BUILD_URL}" -} - -function cirrusci_artifact_url -{ - declare dir - - dir=${PATCH_DIR##*/} - echo "https://api.cirrus-ci.com/v1/artifact/task/${CIRRUS_TASK_ID}/other/${dir}" -} From 96204a39c45fb4524a11acbc9e200e93815c2614 Mon Sep 17 00:00:00 2001 From: Allen Wittenauer Date: Sat, 25 Apr 2026 08:01:04 -0700 Subject: [PATCH 2/2] missed these --- .../source/documentation/in-progress/precommit/index.html.md | 1 - .../documentation/in-progress/precommit/robots/index.html.md | 1 - 2 files changed, 2 deletions(-) diff --git a/asf-site-src/source/documentation/in-progress/precommit/index.html.md b/asf-site-src/source/documentation/in-progress/precommit/index.html.md index 34d27dea0..b7a65daf6 100644 --- a/asf-site-src/source/documentation/in-progress/precommit/index.html.md +++ b/asf-site-src/source/documentation/in-progress/precommit/index.html.md @@ -110,7 +110,6 @@ Automation and Isolation: * [Azure Pipelines](robots/azurepipelines) * [Buildkite](robots/buildkite) * [Circle CI](robots/circleci) -* [Cirrus CI](robots/cirrusci) * [Docker](docker) version 1.7.0+ * [Github Actions](robots/githubactions) * [Gitlab CI](robots/gitlabci) diff --git a/asf-site-src/source/documentation/in-progress/precommit/robots/index.html.md b/asf-site-src/source/documentation/in-progress/precommit/robots/index.html.md index 16d79b93f..12b04225a 100644 --- a/asf-site-src/source/documentation/in-progress/precommit/robots/index.html.md +++ b/asf-site-src/source/documentation/in-progress/precommit/robots/index.html.md @@ -49,7 +49,6 @@ The following systems are detected automatically when run in one of these enviro * [Azure Pipelines](azurepipelines) * [Buildkite](buildkite) * [Circle CI](circleci) -* [Cirrus CI](cirrusci) * [GitHub Actions](githubactions) * [Gitlab CI](gitlabci) * [Jenkins](jenkins)