omkhar commented on PR #67397: URL: https://github.com/apache/airflow/pull/67397#issuecomment-4540028294
Pushed `586913359b` — rebased onto current `apache/main`, which now includes [#67455](https://github.com/apache/airflow/pull/67455) (bound scheduler shutdown wait, merged 2026-05-25 19:00Z) and [#67170](https://github.com/apache/airflow/pull/67170) (90s execution_timeout, merged 2026-05-19) — the two recent flake fixes for `test_export_legacy_metric_names`. The earlier run's CI started 2026-05-24 03:15Z, before #67455 landed. One conflict during the rebase, in `providers/edge3/src/airflow/providers/edge3/worker_api/auth.py`: [#67374](https://github.com/apache/airflow/pull/67374) (merged 2026-05-24 20:32Z) removed `jwt_token_authorization_rpc` as dead Airflow-2 code; this PR had also been modifying that function. Resolved by taking #67374's deletion — there are no remaining callers (grepped) and the team_name binding work lives in `jwt_token_authorization`, `jwt_token_authorization_rest`, and the new `assert_jwt_team_matches_body` helper, all unaffected. Diff still scoped to the same 6 `providers/edge3/` files; no airflow-core touches. CI re-running against the post-#67455 base. --- Drafted-by: Claude Code (Opus 4.7); reviewed by @omkhar before posting -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
