Skip to content

Update job names to fix integration test#4985

Open
hbhushan3 wants to merge 1 commit intoopenshift:mainfrom
hbhushan3:fix-integration
Open

Update job names to fix integration test#4985
hbhushan3 wants to merge 1 commit intoopenshift:mainfrom
hbhushan3:fix-integration

Conversation

@hbhushan3
Copy link
Member

@hbhushan3 hbhushan3 commented Mar 4, 2026

Fix testgrid-config-generator integration test

PR #4982 renamed the hardcoded master branch 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 mastermain in the test input and expected output files so the
generator 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.yaml
  • test/integration/testgrid-config-generator/config/release/ocp-4.10.json
  • test/integration/testgrid-config-generator/expected/redhat-openshift-ocp-release-4.10-informing.yaml

Summary by CodeRabbit

  • Chores
    • Updated test infrastructure configuration references and periodic job definitions to align with updated naming conventions.

Copilot AI review requested due to automatic review settings March 4, 2026 19:31
@openshift-ci-robot
Copy link
Contributor

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: automatic mode

@coderabbitai
Copy link

coderabbitai bot commented Mar 4, 2026

Walkthrough

The 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

Cohort / File(s) Summary
Periodic Job Configuration
test/integration/testgrid-config-generator/config/jobs/org/repo/org-repo-master-periodics.yaml
Updated 2 periodic job names from master-based to main-based references (e.g., periodic-ci-openshift-release-master-ci-4.10-e2e-aws-ovn-upgradeperiodic-ci-openshift-release-main-ci-4.10-e2e-aws-ovn-upgrade).
Release Configuration
test/integration/testgrid-config-generator/config/release/ocp-4.10.json
Updated 2 PROW job references in the verify section from master to main branch identifiers.
TestGrid Expected Output
test/integration/testgrid-config-generator/expected/redhat-openshift-ocp-release-4.10-informing.yaml
Replaced master references with main in multiple YAML fields (name, test_group_name, gcs_prefix) across dashboard and test group entries.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately describes the main change: updating job names (specifically from master to main references) to fix a failing integration test.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Stable And Deterministic Test Names ✅ Passed Job names in modified configuration files are stable and deterministic with only static descriptive strings and no dynamic elements.
Test Structure And Quality ✅ Passed The PR modifies only test data and fixture files (YAML and JSON), not actual test code. Integration and unit tests remain unchanged.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment

Tip

Try Coding Plans. Let us write the prompt for your AI agent so you can ship faster (with fewer bugs).
Share your feedback on Discord.


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.

❤️ Share

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

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 4, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: hbhushan3
Once this PR has been reviewed and has the lgtm label, please assign jmguzik for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Updates the testgrid-config-generator integration test fixtures to reflect the mastermain 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
Copy link

Copilot AI Mar 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copilot uses AI. Check for mistakes.
Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

📥 Commits

Reviewing files that changed from the base of the PR and between ac09bd6 and 8cd0d6a.

📒 Files selected for processing (3)
  • test/integration/testgrid-config-generator/config/jobs/org/repo/org-repo-master-periodics.yaml
  • test/integration/testgrid-config-generator/config/release/ocp-4.10.json
  • test/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
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

🧩 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.go

Repository: 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.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 4, 2026

@hbhushan3: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/integration 8cd0d6a link true /test integration
ci/prow/breaking-changes 8cd0d6a link false /test breaking-changes
ci/prow/checkconfig 8cd0d6a link true /test checkconfig
ci/prow/frontend-checks 8cd0d6a link true /test frontend-checks

Full PR test history. Your PR dashboard.

Details

Instructions 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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants