This is an automated email from the ASF dual-hosted git repository. github-merge-queue[bot] pushed a commit to branch gh-readonly-queue/master/pr-20678-0eb98b0051421125b9d1ca3ccb19072131d1e1a5 in repository https://gitbox.apache.org/repos/asf/hudi.git
commit 47958f5309ffb46cb6ffda3b9e9d7fc512c004ad Author: voonhous <[email protected]> AuthorDate: Tue Nov 17 06:47:48 2026 +0000 chore(ci): drop the transitional Java CI Engines result job (#20678) #20655 folded Java CI Engines into bot.yml and kept a job that reported the Java CI Engines result context with the result of Java CI result, because branch protection still required that context. .asf.yaml now requires only validate-pr-and-source and Java CI result, and GitHub no longer marks the context as required on PRs, so the job and its tests go. --- .github/ci/scripts/test-fork-ci-status.cjs | 31 ++++-------------------------- .github/workflows/README.md | 2 +- .github/workflows/bot.yml | 20 ------------------- 3 files changed, 5 insertions(+), 48 deletions(-) diff --git a/.github/ci/scripts/test-fork-ci-status.cjs b/.github/ci/scripts/test-fork-ci-status.cjs index cc2c6d6ecf8e..79aa181d1500 100644 --- a/.github/ci/scripts/test-fork-ci-status.cjs +++ b/.github/ci/scripts/test-fork-ci-status.cjs @@ -33,10 +33,9 @@ function workflow(name) { })); } const bridgeWorkflow = workflow('fork_ci_status.yml'); -// The Java CI workflow the bridge mirrors, with the id of its aggregate job and of the transitional -// job that reports the former Java CI Engines context. +// The Java CI workflow the bridge mirrors, with the id of its aggregate job. const ci = { - file: 'bot.yml', name: 'Java CI', aggregate: 'java-ci-result', transitional: 'java-ci-engines-result', + file: 'bot.yml', name: 'Java CI', aggregate: 'java-ci-result', workflow: workflow('bot.yml'), }; const AsyncFunction = Object.getPrototypeOf(async function () {}).constructor; @@ -388,7 +387,7 @@ const skippedChanges = { changes: { result: 'skipped', outputs: {} } }; const jobIf = (job, github, needs = skippedChanges) => interpolate(ci.workflow.jobs[job].if, { github: withName(github), needs, ...functions }); const testJobs = Object.keys(ci.workflow.jobs).filter((job) => - ![ci.aggregate, ci.transitional, 'changes'].includes(job)); + ![ci.aggregate, 'changes'].includes(job)); // GitHub expressions resolve absent properties to an empty string. function context({ event_name, repository = 'apache/hudi', ref = 'refs/heads/feature', sha = 'first', @@ -467,7 +466,7 @@ test('BUNDLE_MODULES lists every bundle of the default reactor', () => { assert.deepEqual([...listed].sort(), [...bundles].sort()); }); -// [case, context, whether the test jobs run, whether the aggregate jobs run, the `changes` job] +// [case, context, whether the test jobs run, whether the aggregate job runs, the `changes` job] for (const [name, github, tests, aggregate, needs] of [ ['fork PR to master', forkPr, false, true], ['fork PR to release-1.2', { ...forkPr, base_ref: 'release-1.2' }, true, true], @@ -490,7 +489,6 @@ for (const [name, github, tests, aggregate, needs] of [ test('routes ' + name, () => { for (const job of testJobs) assert.equal(jobIf(job, github, needs), tests, job); assert.equal(jobIf(ci.aggregate, github, needs), aggregate, ci.aggregate); - assert.equal(jobIf(ci.transitional, github, needs), aggregate, ci.transitional); // The selector runs on merge_group only; GitHub evaluates an `if` without ${{ }} as an expression. assert.equal(evaluate(ci.workflow.jobs.changes.if, { github }), github.event_name === 'merge_group'); }); @@ -545,27 +543,6 @@ test('the aggregate job links the fork run of bot.yml on fork PRs', () => { assert.ok(step.run.includes('/actions/workflows/' + ci.file + ')')); assert.doesNotMatch(step.run, /\$\{\{/); }); -// Branch protection required `Java CI Engines result` before Java CI Engines was folded into -// bot.yml, so a transitional job reports that context with the result of the aggregate job. -test('the transitional job reports the result of the aggregate job as Java CI Engines result', () => { - const job = ci.workflow.jobs[ci.transitional]; - const aggregate = ci.workflow.jobs[ci.aggregate]; - assert.equal(job.name, 'Java CI Engines result'); - assert.equal(job.needs, ci.aggregate); - assert.equal(job.if, aggregate.if); - assert.equal(job['runs-on'], 'ubuntu-slim'); - assert.deepEqual(job.permissions, {}); - assert.equal(job.steps.length, 1); - const [step] = job.steps; - for (const result of ['success', 'failure', 'skipped', 'cancelled']) { - const needs = { [ci.aggregate]: { result } }; - assert.equal(interpolate(step.if, { needs, ...functions }), result !== 'success', result); - } - assert.match(step.run, /::error::/); - assert.match(step.run, /exit 1/); - assert.doesNotMatch(step.run, /\$\{\{/); -}); - // The docs-only selector, the `changes` job. const changesJob = ci.workflow.jobs.changes; const changesStep = changesJob.steps.find((item) => item.id === 'diff'); diff --git a/.github/workflows/README.md b/.github/workflows/README.md index 3a167fbb6d85..0508b8a7c281 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -3,7 +3,7 @@ When updating the pr template, you must consider if updates need to be made to scripts/pr_compliance.py ## What are the files in workflows? -- bot.yml: Java CI. Spark lanes (JDK 11 on Spark 3.5, JDK 17 on Spark 4.2), Flink, bundle validation and integration tests. Runs on PRs, merge-queue groups and branch pushes; only push runs are path-filtered. Forks run it on every branch push; upstream it skips every job on pushes to branches other than master, release-* and branch-0.x, and every job but the aggregate on PRs from forks to master (see [Pull requests from forks](#pull-requests-from-forks)). Every test job depends only on t [...] +- bot.yml: Java CI. Spark lanes (JDK 11 on Spark 3.5, JDK 17 on Spark 4.2), Flink, bundle validation and integration tests. Runs on PRs, merge-queue groups and branch pushes; only push runs are path-filtered. Forks run it on every branch push; upstream it skips every job on pushes to branches other than master, release-* and branch-0.x, and every job but the aggregate on PRs from forks to master (see [Pull requests from forks](#pull-requests-from-forks)). Every test job depends only on t [...] - fork_ci_status.yml: Fork CI status. Mirrors the fork's bot.yml run for the head commit of each open fork PR to master onto the PR as the `CI (fork)` check, which also asks for action when the head commit has no fork run although the PR changes more than docs and images. Runs when an upstream Java CI run completes and every 15 minutes for late runs and reruns. It never checks out PR code. Its tests, .github/ci/scripts/test-fork-ci-status.cjs, also cover the routing and concurrency of bot.yml - fork_coverage_bridge.yml: Fork coverage bridge. Every 15 minutes, uploads to Codecov the JaCoCo reports that the fork's bot.yml runs stored as artifacts (through .github/actions/upload-coverage) for the head commit of each recently updated fork PR to master, and records each uploaded commit as a `Coverage (fork)` check. It never checks out or runs PR code; its tests are .github/ci/scripts/test-fork-coverage-bridge.cjs - validate_source.yml: PR and Source Validation. One job, `validate-pr-and-source`, one of the two required status checks with `Java CI result`: it checks the PR description with scripts/pr_compliance.py, runs that script's own tests and the fork_ci_status.yml and fork_coverage_bridge.yml tests, validates the PR title, rejects commits with a Claude co-author trailer, and runs the source release checks (RAT, binary files, copyright). Never path-filtered, because a required check must repo [...] diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml index 847ae151097e..d8b4206192ae 100644 --- a/.github/workflows/bot.yml +++ b/.github/workflows/bot.yml @@ -2145,23 +2145,3 @@ jobs: run: | echo "::error::$REQUIREMENT The summary step above lists each result." exit 1 - - # Transitional. Before Java CI Engines was folded into this workflow, .asf.yaml required its - # `Java CI Engines result` context. Branch protection changes only after this change merges, and - # .asf.yaml applies have failed with HTTP 502 when many PRs are open, so this job keeps reporting - # that context with the result of `Java CI result`. Delete it in a follow-up once master's branch - # protection no longer lists the context. - java-ci-engines-result: - name: Java CI Engines result - runs-on: ubuntu-slim - if: ${{ always() && !(github.event_name == 'push' && github.repository == 'apache/hudi' && github.ref != 'refs/heads/master' && !startsWith(github.ref, 'refs/heads/release-') && github.ref != 'refs/heads/branch-0.x') }} - permissions: {} - needs: java-ci-result - steps: - - name: Fail unless Java CI result succeeded - if: ${{ needs.java-ci-result.result != 'success' }} - env: - RESULT: ${{ needs.java-ci-result.result }} - run: | - echo "::error::Java CI result is $RESULT. This transitional check mirrors it; see Java CI result for details." - exit 1
