Skip to content

Update job names to fix integration test #4985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hbhushan3 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update job names to fix integration test #4985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...integration/testgrid-config-generator/config/jobs/org/repo/org-repo-master-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ periodics:
interval: 12h
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 Mar 4, 2026

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.

- agent: kubernetes
decorate: true
interval: 12h
labels:
job-release: "4.10"
name: periodic-ci-openshift-release-master-ci-4.10-upgrade-from-stable-4.9-e2e-aws-ovn-upgrade
name: periodic-ci-openshift-release-main-ci-4.10-upgrade-from-stable-4.9-e2e-aws-ovn-upgrade
4 changes: 2 additions & 2 deletions test/integration/testgrid-config-generator/config/release/ocp-4.10.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
"verify":{
"aggregated-aws-ovn-upgrade-4.10-micro":{
"upgrade":true,
"prowJob":{"name":"periodic-ci-openshift-release-master-ci-4.10-e2e-aws-ovn-upgrade"},
"prowJob":{"name":"periodic-ci-openshift-release-main-ci-4.10-e2e-aws-ovn-upgrade"},
"aggregatedProwJob": {
"analysisJobCount": 10
}
},
"aggregated-aws-ovn-upgrade-4.10-minor":{
"upgrade":true,
"upgradeFrom": "PreviousMinor",
"prowJob":{"name":"periodic-ci-openshift-release-master-ci-4.10-upgrade-from-stable-4.9-e2e-aws-ovn-upgrade"},
"prowJob":{"name":"periodic-ci-openshift-release-main-ci-4.10-upgrade-from-stable-4.9-e2e-aws-ovn-upgrade"},
"aggregatedProwJob": {
"analysisJobCount": 10
}
Expand Down
16 changes: 8 additions & 8 deletions ...ation/testgrid-config-generator/expected/redhat-openshift-ocp-release-4.10-informing.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ dashboards:
- key: comment
value: 'test: <test-name> failed, see job: <link>'
url: https://bugzilla.redhat.com/enter_bug.cgi
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
open_bug_template:
url: https://github.com/openshift/origin/issues/
open_test_template:
url: https://prow.ci.openshift.org/view/gs/<gcs_prefix>/<changelist>
results_url_template:
url: https://prow.ci.openshift.org/job-history/<gcs_prefix>
test_group_name: periodic-ci-openshift-release-master-ci-4.10-e2e-aws-ovn-upgrade
test_group_name: periodic-ci-openshift-release-main-ci-4.10-e2e-aws-ovn-upgrade
- base_options: width=10&exclude-filter-by-regex=Monitor%5Cscluster&exclude-filter-by-regex=%5Eoperator.Run%20template.*container%20test%24
code_search_path: https://github.com/openshift/origin/search
code_search_url_template:
Expand All @@ -46,19 +46,19 @@ dashboards:
- key: comment
value: 'test: <test-name> failed, see job: <link>'
url: https://bugzilla.redhat.com/enter_bug.cgi
name: periodic-ci-openshift-release-master-ci-4.10-upgrade-from-stable-4.9-e2e-aws-ovn-upgrade
name: periodic-ci-openshift-release-main-ci-4.10-upgrade-from-stable-4.9-e2e-aws-ovn-upgrade
open_bug_template:
url: https://github.com/openshift/origin/issues/
open_test_template:
url: https://prow.ci.openshift.org/view/gs/<gcs_prefix>/<changelist>
results_url_template:
url: https://prow.ci.openshift.org/job-history/<gcs_prefix>
test_group_name: periodic-ci-openshift-release-master-ci-4.10-upgrade-from-stable-4.9-e2e-aws-ovn-upgrade
test_group_name: periodic-ci-openshift-release-main-ci-4.10-upgrade-from-stable-4.9-e2e-aws-ovn-upgrade
name: redhat-openshift-ocp-release-4.10-informing
test_groups:
- days_of_results: 50
gcs_prefix: test-platform-results/logs/periodic-ci-openshift-release-master-ci-4.10-e2e-aws-ovn-upgrade
name: periodic-ci-openshift-release-master-ci-4.10-e2e-aws-ovn-upgrade
gcs_prefix: test-platform-results/logs/periodic-ci-openshift-release-main-ci-4.10-e2e-aws-ovn-upgrade
name: periodic-ci-openshift-release-main-ci-4.10-e2e-aws-ovn-upgrade
- days_of_results: 50
gcs_prefix: test-platform-results/logs/periodic-ci-openshift-release-master-ci-4.10-upgrade-from-stable-4.9-e2e-aws-ovn-upgrade
name: periodic-ci-openshift-release-master-ci-4.10-upgrade-from-stable-4.9-e2e-aws-ovn-upgrade
gcs_prefix: test-platform-results/logs/periodic-ci-openshift-release-main-ci-4.10-upgrade-from-stable-4.9-e2e-aws-ovn-upgrade
name: periodic-ci-openshift-release-main-ci-4.10-upgrade-from-stable-4.9-e2e-aws-ovn-upgrade
Loading