Update job names to fix integration test#4985
Update job names to fix integration test#4985hbhushan3 wants to merge 1 commit intoopenshift:mainfrom
Conversation
|
Pipeline controller notification For optional jobs, comment This repository is configured in: automatic mode |
WalkthroughThe changes update references from "master" to "main" across three test configuration files for OpenShift release CI/CD pipelines. Updates include periodic job definitions, PROW job references, and TestGrid configuration entries. All changes are string substitutions without structural or logic modifications. Changes
Estimated code review effort🎯 1 (Trivial) | ⏱️ ~3 minutes 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Tip Try Coding Plans. Let us write the prompt for your AI agent so you can ship faster (with fewer bugs). Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: hbhushan3 The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
There was a problem hiding this comment.
Pull request overview
Updates the testgrid-config-generator integration test fixtures to reflect the master → main job name prefix rename introduced in PR #4982, so the generator can correctly match OCP 4.10 jobs and produce the expected dashboards.
Changes:
- Updated prow job names in the integration test prowjob YAML fixture from
...-master-...to...-main-.... - Updated the 4.10 release config fixture to reference the renamed prow jobs.
- Updated the expected generated testgrid dashboard YAML to match the new job/test group names and GCS prefixes.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
test/integration/testgrid-config-generator/config/jobs/org/repo/org-repo-master-periodics.yaml |
Updates periodic job names used as generator input from master to main. |
test/integration/testgrid-config-generator/config/release/ocp-4.10.json |
Updates release config fixture to point at the renamed periodic prow jobs. |
test/integration/testgrid-config-generator/expected/redhat-openshift-ocp-release-4.10-informing.yaml |
Updates expected generated dashboards/test groups to match the renamed jobs. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| labels: | ||
| job-release: "4.10" | ||
| name: periodic-ci-openshift-release-master-ci-4.10-e2e-aws-ovn-upgrade | ||
| name: periodic-ci-openshift-release-main-ci-4.10-e2e-aws-ovn-upgrade |
There was a problem hiding this comment.
The file name still references master (org-repo-master-periodics.yaml) but the job names inside were updated to ...-main-.... Consider renaming the file to org-repo-main-periodics.yaml to keep the test fixture self-descriptive and avoid future confusion when updating integration data.
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In
`@test/integration/testgrid-config-generator/config/jobs/org/repo/org-repo-master-periodics.yaml`:
- Line 80: The testGridInformingPrefixes list in pkg/util/testgrid.go is missing
the new "main" openshift-release prefixes so IsSpecialInformingJobOnTestGrid
fails to recognize renamed jobs; update the testGridInformingPrefixes
constant/variable to add "periodic-ci-openshift-release-main-ci-",
"periodic-ci-openshift-release-main-nightly-", and
"periodic-ci-openshift-release-main-okd-" (the same way existing "master-ci-",
"master-nightly-" and "master-okd-" entries are present) so the function
correctly classifies those periodic job names.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml
Review profile: CHILL
Plan: Pro
Run ID: 94d7ebdb-4d43-46db-b06c-9c66e731a2b3
📒 Files selected for processing (3)
test/integration/testgrid-config-generator/config/jobs/org/repo/org-repo-master-periodics.yamltest/integration/testgrid-config-generator/config/release/ocp-4.10.jsontest/integration/testgrid-config-generator/expected/redhat-openshift-ocp-release-4.10-informing.yaml
| labels: | ||
| job-release: "4.10" | ||
| name: periodic-ci-openshift-release-master-ci-4.10-e2e-aws-ovn-upgrade | ||
| name: periodic-ci-openshift-release-main-ci-4.10-e2e-aws-ovn-upgrade |
There was a problem hiding this comment.
🧩 Analysis chain
🏁 Script executed:
#!/bin/bash
set -euo pipefail
echo "Checking IsSpecialInformingJobOnTestGrid prefixes..."
rg -n -C2 'IsSpecialInformingJobOnTestGrid|periodic-ci-openshift-release-(master|main)-(ci|nightly|okd)-' pkg/util/testgrid.go
echo
echo "Checking integration fixtures now use main-based names..."
rg -n -C1 'periodic-ci-openshift-release-main-ci-4\.10-(e2e-aws-ovn-upgrade|upgrade-from-stable-4\.9-e2e-aws-ovn-upgrade)' test/integration/testgrid-config-generator
echo
echo "Expected result:"
echo "- Matcher should include main prefixes (ideally keep master + main for backward compatibility)."
echo "- Fixtures should consistently reference main names."Repository: openshift/ci-tools
Length of output: 5510
🏁 Script executed:
#!/bin/bash
set -euo pipefail
# Get the complete list of testGridInformingPrefixes to see if main is included anywhere
cat pkg/util/testgrid.goRepository: openshift/ci-tools
Length of output: 1069
Update pkg/util/testgrid.go to include main prefixes for openshift-release jobs.
The renamed jobs at lines 80 and 86 use periodic-ci-openshift-release-main-ci-* prefixes, but IsSpecialInformingJobOnTestGrid only recognizes master-ci-, master-nightly-, and master-okd- prefixes. These jobs will not be classified as special informing and will be dropped from TestGrid behavior.
Add the corresponding main prefixes to testGridInformingPrefixes:
"periodic-ci-openshift-release-main-ci-""periodic-ci-openshift-release-main-nightly-""periodic-ci-openshift-release-main-okd-"
Also applies to: 86-86
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In
`@test/integration/testgrid-config-generator/config/jobs/org/repo/org-repo-master-periodics.yaml`
at line 80, The testGridInformingPrefixes list in pkg/util/testgrid.go is
missing the new "main" openshift-release prefixes so
IsSpecialInformingJobOnTestGrid fails to recognize renamed jobs; update the
testGridInformingPrefixes constant/variable to add
"periodic-ci-openshift-release-main-ci-",
"periodic-ci-openshift-release-main-nightly-", and
"periodic-ci-openshift-release-main-okd-" (the same way existing "master-ci-",
"master-nightly-" and "master-okd-" entries are present) so the function
correctly classifies those periodic job names.
|
@hbhushan3: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
Fix testgrid-config-generator integration test
PR #4982 renamed the hardcoded
masterbranch prefixes in the testgrid generator code(
periodic-ci-openshift-release-master-ci-→periodic-ci-openshift-release-main-ci-),but did not update the integration test data to match.
This updates
master→mainin the test input and expected output files so thegenerator correctly recognizes the 4.10 OCP jobs and produces the expected dashboards.
Changed files
test/integration/testgrid-config-generator/config/jobs/org/repo/org-repo-master-periodics.yamltest/integration/testgrid-config-generator/config/release/ocp-4.10.jsontest/integration/testgrid-config-generator/expected/redhat-openshift-ocp-release-4.10-informing.yamlSummary by CodeRabbit