[Bugfix] Fix broken CI

[Potabk]

What this PR does / why we need it?

• Fix broken commit by #20927
• Fix broken commit by #20466
• TODO: more fully adapt to the upstream reconstruction, let's first make CI happy

Does this PR introduce any user-facing change?

How was this patch tested?

• vLLM version: v0.9.2
• vLLM main: vllm-project/vllm@11dfdf2

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 54.18%. Comparing base (ef99fe1) to head (ea366e5).
Report is 5 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1848      +/-   ##
==========================================
- Coverage   54.22%   54.18%   -0.05%     
==========================================
  Files          75       74       -1     
  Lines        9244     9235       -9     
==========================================
- Hits         5013     5004       -9     
  Misses       4231     4231              

Flag	Coverage Δ
unittests	54.18% <100.00%> (-0.05%)	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

[MengqingCao]

LGTM