Skip to content

NO-ISSUE: Raise OSAC merge-queue timeout to 180m - #251

Merged
minmzzhang merged 2 commits into
osac-project:mainfrom
minmzzhang:no-issue/osac-merge-queue-timeout-180m
Oct 8, 2026
Merged

minmzzhang merged 2 commits into
osac-project:mainfrom
minmzzhang:no-issue/osac-merge-queue-timeout-180m

Conversation

@minmzzhang

@minmzzhang minmzzhang commented Oct 8, 2026 •

Copy link
Copy Markdown
Contributor

Summary

  • Increase OSAC's merge-queue check-response timeout from 120 to 180 minutes.

Why

On Oct 8, PR #1321's merge-group checks started around 09:24 UTC. The CaaS full-install check completed at 11:36 UTC, while the queue removed the entry at 11:25 UTC. The configured 120-minute response window expired before that required gate reported success. A 180-minute window gives about 49 minutes of headroom over the observed 131-minute run.

Validation

  • git diff --check passed.
  • pre-commit run --all-files: all hooks passed except tofu-fmt, which could not run because OpenTofu (tofu) is not installed locally. The repository's CI pre-commit workflow installs OpenTofu and runs this hook.

Summary

  • Increased repo_osac’s merge-queue check_response_timeout_minutes from 120 to 180 minutes.
  • No other merge-queue settings changed. The timeout for repo_osac_test_infra remains 120 minutes.
  • This configuration change gives required checks more time to report before the merge queue removes an entry. It does not change an API, controller, database, authentication, CI workflow, or test.
  • No backward-compatibility impact is reported. The merge queue may wait up to 60 minutes longer for a check response.
  • The author reports that git diff --check passed. The author also reports that all pre-commit hooks passed except tofu-fmt, which could not run because OpenTofu was not installed locally. The repository’s CI workflow reportedly installs OpenTofu and runs that hook; no CI result is provided here.

Risk classification

Risk label and classification criteria are unavailable. The supplied context does not include the labeling instructions or a stated applied label. A comparison with another risk label cannot be established.

Increase the OSAC ruleset response window to 180 minutes because full-install E2E checks can outlast the existing 120-minute limit.

Assisted-by: OpenAI Codex <https://openai.com/codex>
Signed-off-by: Min Zhang <minzhang@redhat.com>
@coderabbitai

coderabbitai Bot commented Oct 8, 2026 •

Copy link
Copy Markdown

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration
  • Configuration used: Repository: osac-project/coderabbit/.coderabbit.yaml
  • Review profile: CHILL
  • Plan: Enterprise
  • Run ID: 83d6ac9e-a182-4489-b58f-78cb28ccded3
📥 Commits

Reviewing files that changed from the base of the PR and between 76b8e1e and 00a9515.

📒 Files selected for processing (1)
  • repositories.tf
🚧 Files skipped from review as they are similar to previous changes (1)
  • repositories.tf

Included review availability: This review used your included allowance. Your plan provides up to 12 included reviews per hour; 10 remain after this review.


Walkthrough

The repo_osac merge queue check response timeout increases from 120 to 180 minutes. Other merge queue settings remain unchanged.

Changes

Merge Queue Timeout

Layer / File(s) Summary
Update check response timeout
repositories.tf
The repo_osac merge queue check response timeout changes from 120 to 180 minutes.

Priority: ➖ Normal

Estimated code review effort: 1 (Trivial) | ~3 minutes

Change: Bug fix

Suggested labels: risk:show

Merge Risk: ⚪ Minimal · up to 00a95

The longer response window addresses the reported check duration without an identified merge-blocking issue. Normal validation remains appropriate.

🚥 Pre-merge checks | ✅ 11
✅ Passed checks (11 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly and concisely describes the main change: increasing the OSAC merge-queue timeout from 120 to 180 minutes.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 0…
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
No-Hardcoded-Secrets ✅ Passed The pull request changes only repositories.tf. It adds a descriptive comment and changes repo_osac.merge_queue.check_response_timeout_minutes from 120 to 180. No API keys, tokens, passwords, p…
No-Weak-Crypto ✅ Passed The pull request only changes the OSAC merge-queue timeout from 120 to 180 minutes and adds a comment. The changed lines introduce no MD5, SHA1, DES, RC4, 3DES, Blowfish, ECB, custom cryptography, or …
No-Injection-Vectors ✅ Passed PASS: The pull request changes only a Terraform merge-queue timeout from 120 to 180 and adds a comment. The value is passed as a numeric field to the merge-queue configuration. No SQL concatenation, s…
Container-Privileges ✅ Passed The pull request changes only repositories.tf, increasing the OSAC merge-queue timeout from 120 to 180 minutes and adding a comment. It introduces no container or Kubernetes manifest settings, and n…
No-Sensitive-Data-In-Logs ✅ Passed The pull request changes only repositories.tf: it adds a general merge-queue comment and changes check_response_timeout_minutes from 120 to 180. No logging code or sensitive data is introduced.
Ai-Attribution ✅ Passed Both commits mention OpenAI Codex and include the Red Hat-approved Assisted-by: OpenAI Codex <https://openai.com/codex> trailer. No Co-Authored-By trailer is present.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create a new PR

Comment @coderabbitai help to get the list of available commands.

@minmzzhang
minmzzhang marked this pull request as ready for review October 8, 2026 13:19
Move the timeout rationale outside the attribute block so tofu fmt preserves its alignment.

Assisted-by: OpenAI Codex <https://openai.com/codex>
Signed-off-by: Min Zhang <minzhang@redhat.com>
@rccrdpccl

Copy link
Copy Markdown
Contributor

/lgtm

@rccrdpccl

Copy link
Copy Markdown
Contributor

/approve

@minmzzhang
minmzzhang enabled auto-merge (squash) October 8, 2026 13:39
@minmzzhang
minmzzhang merged commit 2b83bd7 into osac-project:main Oct 8, 2026
2 checks passed
minmzzhang added a commit that referenced this pull request Oct 8, 2026
## Summary
- Remove the duplicate `ibengal` entry from `members.csv` and
`team-members/fulfillment-wg.csv`.
- Unblock OpenTofu validation and the automatic apply of the 180-minute
OSAC merge-queue timeout from #251.

## Context
The post-merge apply fails `tofu validate` with duplicate object keys
for `ibengal` and `fulfillment-wg-ibengal`. Since validation fails
before `tofu apply`, the live ruleset remains at 120 minutes. This
removes the repeated rows while preserving each existing membership.

## Jira
N/A

## Test plan
- [x] `pre-commit run --files members.csv
team-members/fulfillment-wg.csv`
- [x] `git diff --check`
- [ ] `tofu validate` (not run locally; OpenTofu is unavailable in this
environment)

---

_This PR description was drafted with AI assistance
([create-pr](https://github.com/osac-project/osac-workspace/tree/main/skills/create-pr)
v0.1.3). Review for accuracy._

Signed-off-by: Min Zhang <minzhang@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants