fix: Rename gh Second to GHE and move remove flaky by chmouel · Pull Request #2480 · tektoncd/pipelines-as-code

chmouel · 2026-02-13T19:32:24Z

Description

Renames the github_second_controller E2E provider to github_ghe for clarity
and simplifies the CI matrix by folding the standalone e2e-flaky-tests job
into the main e2e-tests matrix.

Renames github_second_controller provider to github_ghe in CI workflow,
hack/gh-workflow-ci.sh, and test/README.md
Merges the separate e2e-flaky-tests job into the e2e-tests matrix as
the flaky provider, removing ~130 lines of duplicated CI config
Consolidates github_1 / github_2 splits into a single github_public
provider
Renames PRTest.SecondController field to PRTest.GHE and the Setup
parameter onSecondController to onGHE
Renames all TestGithubSecond* test functions to TestGithubGHE*

Linked Jira

Linked GitHub Issue

Fixes #

Type of Change

Testing Strategy

AI Assistance

I have not used any AI assistance for this PR.
I have used AI assistance for this PR.

If you have used AI assistance, please provide the following details:

Which LLM was used?

Extent of AI Assistance:

Documentation and research only
Unit tests or E2E tests only
Code generation (parts of the code)
Full code generation (most of the PR)
PR description and comments
Commit message(s)

Important

If the majority of the code in this PR was generated by an AI, please add a Co-authored-by trailer to your commit message.
For example:

Co-authored-by: Gemini gemini@google.com
Co-authored-by: ChatGPT noreply@chatgpt.com
Co-authored-by: Claude noreply@anthropic.com
Co-authored-by: Cursor noreply@cursor.com
Co-authored-by: Copilot Copilot@users.noreply.github.com

**You can use the script ./hack/add-llm-coauthor.sh to automatically add
these co-author trailers to your commits.

Submitter Checklist

pipelines-as-code · 2026-02-13T19:32:46Z

🔍 PR Lint Feedback

Note: This automated check helps ensure your PR follows our contribution guidelines.

⚠️ Items that need attention:

🎫 Jira reference

Add a Jira reference in the description using one of the following formats:

https://issues.redhat.com/browse/SRVKP-<number>

If no SRVKP ticket exists yet, link a GitHub issue instead (e.g., Fixes #123).
Minor housekeeping PRs without Jira coverage can skip this after confirming with reviewers.

🤖 AI attribution

The following commits lack an explicit AI attribution footer:

28f3d34 test: refactor E2E matrix and rename SecondController to GHE

If no AI assistance was used for a commit, you can ignore this warning.
Otherwise add an Assisted-by: or Co-authored-by: footer referencing the AI used.

ℹ️ Next Steps

Review and address the items above
Push new commits to update this PR
This comment will be automatically updated when issues are resolved

🔧 Admin Tools (click to expand)

Automated Issue/Ticket Creation:

/issue-create - Generate a GitHub issue from this PR content using AI
/jira-create - Create a SRVKP Jira ticket from this PR content using AI

⚠️ Important: Always review and edit generated content before finalizing tickets/issues.
The AI-generated content should be used as a starting point and may need adjustments.

These commands are available to maintainers and will post the generated content as PR comments for review.

_{🤖 This feedback was generated automatically by the PR CI system}

gemini-code-assist · 2026-02-13T19:32:50Z

Summary of Changes

Hello @chmouel, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request refactors the GitHub End-to-End testing infrastructure to enhance clarity and maintainability. The primary goal is to standardize the naming convention for GitHub Enterprise tests, moving from an ambiguous 'second controller' designation to a more explicit 'GHE'. Additionally, the CI workflow has been optimized by consolidating flaky tests into the main test matrix, which simplifies test management and execution. These changes collectively improve the organization and efficiency of the testing suite.

Highlights

Renaming GitHub Enterprise provider: The github_second_controller provider has been renamed to github_ghe across the codebase for improved clarity and consistency in identifying GitHub Enterprise-related tests and configurations.
CI Workflow Refactoring: The dedicated 'e2e-flaky-tests' CI job has been removed, and flaky tests are now integrated into the main e2e-tests matrix under a new flaky provider, streamlining the testing process.
Test Code Updates: Numerous Go test files have been updated to reflect the new github_ghe naming convention and to utilize a new GHE boolean flag in the PRTest struct, replacing the SecondController flag.

Changelog

hack/gh-workflow-ci.sh
- Updated test target names from github_second_controller to github_ghe and github_1/github_2 to github_public.
- Removed logic for splitting GitHub tests into two parts, consolidating them under github_public.
test/README.md
- Updated documentation to reflect the new github_public, github_ghe, and flaky test categories.
test/github_config_maxkeepruns_test.go
- Renamed TestGithubSecondMaxKeepRuns to TestGithubGHEMaxKeepRuns.
- Updated PRTest struct initialization to use GHE: true instead of SecondController: true.
test/github_incoming_test.go
- Renamed several test functions from TestGithubSecondAppIncoming* to TestGithubGHEAppIncoming*.
- Updated the verifyIncomingWebhook function signature and calls to use onGHE instead of onSecondController.
test/github_pullrequest_concurrency_multiplepr_test.go
- Renamed TestGithubSecondPullRequestConcurrencyMultiplePR to TestGithubGHEPullRequestConcurrencyMultiplePR.
test/github_pullrequest_concurrency_test.go
- Renamed multiple test functions from TestGithubSecondPullRequestConcurrency* to TestGithubGHEPullRequestConcurrency*.
test/github_pullrequest_privaterepository_test.go
- Renamed TestGithubSecondPullRequestGitClone to TestGithubGHEPullRequestGitClone.
- Updated PRTest struct initialization to use GHE: true instead of SecondController: true.
test/github_pullrequest_retest_test.go
- Renamed multiple test functions from TestGithubSecondPullRequestGitopsCommentRetest and TestGithubSecondRetestWithMultipleFailedPipelineRuns to their GHE equivalents.
- Updated PRTest struct initialization to use GHE: true instead of SecondController: true.
test/github_pullrequest_test.go
- Renamed multiple test functions from TestGithubSecondPullRequest* to TestGithubGHEPullRequest*.
- Updated PRTest struct initialization to use GHE: true instead of SecondController: true.
test/github_pullrequest_test_comment_test.go
- Renamed TestGithubSecondPullRequestTest and TestGithubSecondOnCommentAnnotation to their GHE equivalents.
- Updated PRTest struct initialization to use GHE: true instead of SecondController: true.
test/github_push_retest_test.go
- Renamed multiple test functions from TestGithubSecondPushRequestGitOpsComment* to their GHE equivalents.
- Updated PRTest struct initialization to use GHE: true instead of SecondController: true.
test/github_push_test.go
- Renamed TestGithubSecondPush to TestGithubGHEPush.
- Updated PRTest struct initialization to use GHE: true instead of SecondController: true.
test/github_skip_ci_test.go
- Renamed multiple test functions from TestGithubSecondSkipCI* to TestGithubGHESkipCI*.
- Updated PRTest struct initialization and verifySkipCI function to use GHE instead of SecondController.
test/github_tag_gitops_test.go
- Renamed TestGithubSecondGitOpsCommentOnTag to TestGithubGHEGitOpsCommentOnTag.
test/github_tkn_pac_cli_test.go
- Renamed TestGithubSecondPacCli to TestGithubGHEPacCli.
test/pkg/github/instrumentation.go
- Updated logic to check for g.GHE instead of g.SecondController when determining controller name.
test/pkg/github/pr.go
- Updated the PRTest struct definition to replace SecondController with GHE.
- Modified RunPullRequest and RunPushRequest methods to pass g.GHE to the Setup function.
test/pkg/github/setup.go
- Updated the Setup function signature to use onGHE instead of onSecondController.
- Modified conditional logic to check onGHE for GitHub Enterprise-specific environment variables and configurations.

Ignored Files

Ignored by pattern: .github/workflows/** (1)
- .github/workflows/e2e.yaml

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description
Code Review	`/gemini review`	Performs a code review for the current pull request in its current state.
Pull Request Summary	`/gemini summary`	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help	`/gemini help`	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

gemini-code-assist

Code Review

The pull request successfully renames the GitHub Enterprise (GHE) provider from github_second_controller to github_ghe across the CI scripts and E2E tests. It also consolidates the public GitHub tests into a single github_public target and ensures flaky tests are correctly routed to the flaky job. The changes are consistent and maintain the existing test partitioning logic. Note that TEST_GITHUB_SECOND_EL_URL is now a required environment variable for GHE tests, and the consolidation of public GitHub tests into a single job may impact CI parallelism if the number of tests grows significantly.

test/github_pullrequest_test.go

Copilot

Pull request overview

This PR improves the clarity and consistency of GitHub E2E test naming by replacing ambiguous "Second" terminology with the clearer "GHE" (GitHub Enterprise) designation. The changes also consolidate the CI pipeline by moving flaky tests from a separate job into the main test matrix, simplifying the workflow configuration.

Changes:

Renamed github_second_controller provider to github_ghe throughout CI configuration, scripts, and test functions
Renamed SecondController struct field to GHE and onSecondController parameter to onGHE in test helper functions
Consolidated flaky tests into the main e2e-tests matrix job, removing the dedicated e2e-flaky-tests job
Removed the splitting of public GitHub tests into github_1 and github_2, replacing with single github_public provider

Reviewed changes

Copilot reviewed 20 out of 20 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
test/pkg/github/setup.go	Renamed `onSecondController` parameter to `onGHE` for clarity
test/pkg/github/pr.go	Renamed `SecondController` field to `GHE` in PRTest struct
test/pkg/github/instrumentation.go	Updated field references from `SecondController` to `GHE`
test/github_tkn_pac_cli_test.go	Renamed test function from `TestGithubSecond` to `TestGithubGHE`
test/github_tag_gitops_test.go	Renamed test function to use GHE naming convention
test/github_skip_ci_test.go	Renamed test functions and updated struct field references to use GHE
test/github_push_test.go	Renamed test functions and updated struct initialization
test/github_push_retest_test.go	Renamed test functions and updated struct field references
test/github_pullrequest_test_comment_test.go	Renamed test functions and updated struct initialization
test/github_pullrequest_test.go	Renamed 15 test functions from `TestGithubSecond` to `TestGithubGHE`
test/github_pullrequest_retest_test.go	Renamed test functions and updated comments
test/github_pullrequest_privaterepository_test.go	Renamed test function and updated struct initialization
test/github_pullrequest_concurrency_test.go	Renamed 4 test functions and updated comments
test/github_pullrequest_concurrency_multiplepr_test.go	Renamed test function and updated comments
test/github_incoming_test.go	Renamed 9 test functions and updated parameter names
test/github_config_maxkeepruns_test.go	Renamed test function and updated struct initialization
test/README.md	Updated documentation to reflect new provider categories
hack/gh-workflow-ci.sh	Updated test filtering logic and removed `github_1`/`github_2` split
.github/workflows/e2e.yaml	Updated matrix providers and removed separate flaky test job

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

zakisk · 2026-02-19T06:48:09Z

hack/gh-workflow-ci.sh

  local -a github_tests=()
-  if [[ "${target}" == *"github"* ]] && [[ "${target}" != "github_second_controller" ]]; then
-    mapfile -t github_tests < <(echo "${all_tests}" | grep -iP '^TestGithub' 2>/dev/null | grep -ivP 'Concurrency|GithubSecond|Flaky' 2>/dev/null | sort 2>/dev/null)
+  if [[ "${target}" == *"github"* ]] && [[ "${target}" != "github_ghe" ]] && [[ "${target}" != "github_second_controller" ]]; then


Suggested change

if [[ "${target}" == *"github"* ]] && [[ "${target}" != "github_ghe" ]] && [[ "${target}" != "github_second_controller" ]]; then

if [[ "${target}" == *"github"* ]] && [[ "${target}" != "github_ghe" ]]; then

I think its not needed then?

yeah it's to be able to test CI on this pr since we it refers to the e2e.yaml from main will remove when it's green (and then it will be red until we merge)

zakisk · 2026-02-19T06:50:21Z

after the tiny suggestion

/lgtm

chmouel · 2026-02-19T11:00:10Z

all green remove the compat patch and merging

Refactor the end-to-end test suite to standardize naming and simplify the CI workflow. Rename "SecondController" references to "GHE" across test files, structs, and helper functions to clearly identify GitHub Enterprise scenarios. Update the GitHub Actions workflow to use descriptive matrix targets (`github_public`, `github_ghe`) and eliminate the separate flaky test job. Modify the CI script to support these new targets while retaining backward compatibility for the previous target names. Signed-off-by: Chmouel Boudjnah <chmouel@redhat.com>

Copilot AI review requested due to automatic review settings February 13, 2026 19:32

Copilot started reviewing on behalf of chmouel February 13, 2026 19:32 View session

pipelines-as-code bot added fix testing labels Feb 13, 2026

gemini-code-assist bot reviewed Feb 13, 2026

View reviewed changes

test/github_pullrequest_test.go Outdated Show resolved Hide resolved

chmouel force-pushed the absorb-flaky-to-main-tests branch from 956ca56 to ec972c1 Compare February 13, 2026 19:40

pipelines-as-code bot added the e2e label Feb 13, 2026

Copilot AI reviewed Feb 13, 2026

View reviewed changes

chmouel marked this pull request as draft February 14, 2026 06:21

chmouel force-pushed the absorb-flaky-to-main-tests branch from ec972c1 to 5f24319 Compare February 18, 2026 11:02

chmouel marked this pull request as ready for review February 18, 2026 12:14

chmouel force-pushed the absorb-flaky-to-main-tests branch from 1c6eefb to 28f3d34 Compare February 18, 2026 13:00

zakisk reviewed Feb 19, 2026

View reviewed changes

chmouel force-pushed the absorb-flaky-to-main-tests branch from ae2c83c to 3a45a66 Compare February 19, 2026 10:56

chmouel force-pushed the absorb-flaky-to-main-tests branch from 3a45a66 to ec7e2dc Compare February 19, 2026 11:01

chmouel merged commit 3fa3cb9 into tektoncd:main Feb 19, 2026
8 of 11 checks passed

chmouel deleted the absorb-flaky-to-main-tests branch February 19, 2026 11:01

chmouel restored the absorb-flaky-to-main-tests branch February 19, 2026 13:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Rename gh Second to GHE and move remove flaky#2480

fix: Rename gh Second to GHE and move remove flaky#2480
chmouel merged 1 commit intotektoncd:mainfrom
chmouel:absorb-flaky-to-main-tests

chmouel commented Feb 13, 2026 •

edited

Loading

Uh oh!

pipelines-as-code bot commented Feb 13, 2026 •

edited

Loading

Uh oh!

gemini-code-assist bot commented Feb 13, 2026

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

zakisk Feb 19, 2026

Uh oh!

chmouel Feb 19, 2026 •

edited

Loading

Uh oh!

zakisk commented Feb 19, 2026

Uh oh!

chmouel commented Feb 19, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

	if [[ "${target}" == "github" ]] && [[ "${target}" != "github_ghe" ]] && [[ "${target}" != "github_second_controller" ]]; then
	if [[ "${target}" == "github" ]] && [[ "${target}" != "github_ghe" ]]; then

Conversation

chmouel commented Feb 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Linked Jira

Linked GitHub Issue

Type of Change

Testing Strategy

AI Assistance

Submitter Checklist

Uh oh!

pipelines-as-code bot commented Feb 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🔍 PR Lint Feedback

⚠️ Items that need attention:

🎫 Jira reference

🤖 AI attribution

ℹ️ Next Steps

Uh oh!

gemini-code-assist bot commented Feb 13, 2026

Summary of Changes

Highlights

Footnotes

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

zakisk Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

chmouel Feb 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zakisk commented Feb 19, 2026

Uh oh!

chmouel commented Feb 19, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

chmouel commented Feb 13, 2026 •

edited

Loading

pipelines-as-code bot commented Feb 13, 2026 •

edited

Loading

chmouel Feb 19, 2026 •

edited

Loading