fix: merge Pull Request changes by flacatus · Pull Request #79370 · openshift/release

flacatus · 2026-05-17T08:54:50Z

Konflux CI PR Integration & Documentation (updated)

This PR makes the Konflux CI installation step able to merge and test infra-deployments PRs and adds documentation for the install and conformance test steps.

What changed (practical terms)

The konflux install script (ci-operator/step-registry/konflux-ci/install-konflux/konflux-ci-install-konflux-commands.sh) now:
- Chooses a GitHub account with the highest remaining rate limit.
- Clones redhat-appstudio/infra-deployments (main) and, when running as a presubmit with REPO_NAME=infra-deployments and PULL_NUMBER set, fetches refs/pull/<PULL_NUMBER>/head and merges it into the working tree before bootstrapping.
- Continues with cluster login, marks masters schedulable, runs hack/bootstrap-cluster.sh preview, creates the e2e-secrets/quay-repository secret, and registers the PAC route with SprayProxy.
Added README for konflux-ci-install-konflux documenting the step’s behavior, required credentials (mounted secret keys), usage examples, PR-merge behavior, and default timeout (1h).
Added/updated redhat-appstudio conformance-tests README documenting the post-install conformance step: repo/ref selection (Gangway override), test resource deployment, LocalQueue verification, Ginkgo v2 test execution with label filtering, required env vars/credentials, example usage, and a default timeout (2h).

Practical impact

Presubmit jobs can validate infra-deployments changes end-to-end by merging PRs into the bootstrap code path during Konflux installation, enabling more accurate testing of infra changes.
Documentation clarifies how to run and parameterize the install and conformance steps and which secrets and environment variables are required for CI authors and reviewers.

coderabbitai · 2026-05-17T08:55:10Z

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 4e90d7d8-b5b2-4b4a-9537-0de372e68afd

📥 Commits

Reviewing files that changed from the base of the PR and between 424af10 and 9d9f0e7.

📒 Files selected for processing (3)

ci-operator/step-registry/konflux-ci/install-konflux/README.md
ci-operator/step-registry/konflux-ci/install-konflux/konflux-ci-install-konflux-commands.sh
ci-operator/step-registry/redhat-appstudio/conformance-tests/README.md

🚧 Files skipped from review as they are similar to previous changes (1)

ci-operator/step-registry/konflux-ci/install-konflux/konflux-ci-install-konflux-commands.sh

Walkthrough

The Konflux install step script adds conditional logic to merge GitHub PR changes when installing infra-deployments repository. When both REPO_NAME is infra-deployments and PULL_NUMBER is non-empty, the script fetches the PR head ref and merges it; otherwise, installation proceeds unchanged. Two README files for the install and conformance test steps are added.

Changes

Conditional infra-deployments PR merge

Layer / File(s)	Summary
Conditional PR merge for infra-deployments `ci-operator/step-registry/konflux-ci/install-konflux/konflux-ci-install-konflux-commands.sh`	When `REPO_NAME` is `infra-deployments` and `PULL_NUMBER` is non-empty, the script fetches `upstream`'s PR head ref and merges it into the working tree with logging. Otherwise, the script proceeds unchanged.
Install README `ci-operator/step-registry/konflux-ci/install-konflux/README.md`	Adds a new README describing the `konflux-ci-install-konflux` step: flow, required secrets, usage example, PR merge behavior for `infra-deployments`, and timeouts.
Conformance README `ci-operator/step-registry/redhat-appstudio/conformance-tests/README.md`	Adds a new README describing the Konflux conformance-tests step: test workflow, env vars, credential keys, usage example, and timeout guidance.

🎯 2 (Simple) | ⏱️ ~12 minutes

Suggested labels: lgtm, rehearsals-ack

Suggested reviewers:

psturc
gbenhaim

🚥 Pre-merge checks | ✅ 11 | ❌ 1

❌ Failed checks (1 inconclusive)

Check name	Status	Explanation	Resolution
Title check	❓ Inconclusive	The title 'fix: merge Pull Request changes' is vague and does not clearly describe the specific technical change. While it references merging PR changes, it lacks detail about what was actually modified or fixed.	Provide a more specific title that describes the actual change, such as 'feat: add conditional GitHub PR merge support to konflux installation' or similar that conveys the primary modification.

✅ Passed checks (11 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
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.
Stable And Deterministic Test Names	✅ Passed	The PR does not introduce any Ginkgo test code. It only adds bash scripts and documentation for CI test orchestration. The actual Ginkgo tests are in external repositories cloned at runtime.
Test Structure And Quality	✅ Passed	PR does not contain Ginkgo test code. Changes are shell scripts and documentation only. Custom check for test quality is not applicable.
Microshift Test Compatibility	✅ Passed	PR does not add any new Ginkgo e2e tests. Changes consist only of test infrastructure setup scripts and documentation files. The check is not applicable to this PR.
Single Node Openshift (Sno) Test Compatibility	✅ Passed	No new Ginkgo e2e tests added. PR adds shell scripts, documentation, metadata, and OWNERS files only. No Go test files with Ginkgo patterns detected.
Topology-Aware Scheduling Compatibility	✅ Passed	PR adds CI step registry files only. No deployment manifests, operators, or controllers. No scheduling constraints found.
Ote Binary Stdout Contract	✅ Passed	Check not applicable. PR modifies only shell scripts and README docs, no Go test files or OTE binaries.
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	PR does not add Ginkgo e2e tests. Changes are only bash scripts and documentation for Konflux installation/setup infrastructure. Check is not applicable.

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

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

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

flacatus · 2026-05-17T09:01:11Z

/pj-rehearse pull-ci-redhat-appstudio-infra-deployments-main-appstudio-e2e-tests

openshift-merge-bot · 2026-05-17T09:01:13Z

@flacatus: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

flacatus · 2026-05-17T10:21:27Z

/pj-rehearse pull-ci-redhat-appstudio-infra-deployments-main-appstudio-e2e-tests

openshift-merge-bot · 2026-05-17T10:21:29Z

@flacatus: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

konflux-ci-qe-bot · 2026-05-17T10:32:25Z

🤖 Pipeline Failure Analysis

Category: Timeout

The pipeline failed because the Pipelines-as-Code (PaC) system timed out waiting for a push PipelineRun to start for component konflux-ci-upstream-nhgn.

📋 Technical Details

Immediate Cause

The appstudio-e2e-tests/redhat-appstudio-conformance-tests step failed due to a timeout. The test explicitly timed out after 300 seconds, waiting for a push PipelineRun for the konflux-ci-upstream-nhgn component to be initiated by the Pipelines-as-Code system.

Contributing Factors

The component's build status indicated that PaC was "enabled" and configuration was "done", suggesting the system had processed the initial setup. However, the subsequent event of triggering the PipelineRun did not occur within the expected timeframe, indicating a potential delay or bottleneck in the PaC controller's processing or resource allocation for the PipelineRun. Due to analysis failures on several diagnostic logs, further contributing factors could not be definitively identified.

Impact

The inability of the PaC system to start the necessary PipelineRun directly prevented the conformance test from progressing, leading to its failure and subsequently halting the entire job.

🔍 Evidence

appstudio-e2e-tests/redhat-appstudio-conformance-tests

Category: test
Root Cause: The Pipelines-as-Code (PaC) system failed to trigger a push PipelineRun for the component konflux-ci-upstream-nhgn within the allocated 300-second timeout after the PaC initialization branch was merged, causing the test to fail.

Logs:

artifacts/appstudio-e2e-tests/redhat-appstudio-conformance-tests/build-log.txt

   [38;5;9m[FAILED] Timed out after 300.002s.
  timed out waiting for push PipelineRun to start
  Expected success, but got an error:
      <*errors.errorString | 0xc000349720>: 
      pipelinerun user-ns1/konflux-ci-upstream-nhgn-on-push-464j5 hasn't started yet
      {
          s: "pipelinerun user-ns1/konflux-ci-upstream-nhgn-on-push-464j5 hasn't started yet",
      } [0m

artifacts/appstudio-e2e-tests/redhat-appstudio-conformance-tests/build-log.txt

I0518 13:58:46.829478   24466 setup.go:197] diagnostic: PipelineRuns in user-ns1: 0

artifacts/appstudio-e2e-tests/redhat-appstudio-conformance-tests/build-log.txt

I0518 13:58:46.704217   24466 setup.go:183] diagnostic: Component user-ns1/konflux-ci-upstream-nhgn conditions=[] build-status="{\"pac\":{\"state\":\"enabled\",\"merge-url\":\"https://github.com/redhat-appstudio-qe/testrepo/pull/65\",\"configuration-time\":\"Mon, 18 May 2026 13:58:23 UTC\"},\"message\":\"done\"}"

Analysis powered by prow-failure-analysis | Build: 2056367385673207808

Signed-off-by: flacatus <flacatus@redhat.com>

flacatus · 2026-05-17T11:24:00Z

/pj-rehearse pull-ci-redhat-appstudio-infra-deployments-main-appstudio-e2e-tests

openshift-merge-bot · 2026-05-17T11:24:02Z

@flacatus: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

openshift-merge-bot · 2026-05-17T11:26:56Z

[REHEARSALNOTIFIER]
@flacatus: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name	Repo	Type	Reason
pull-ci-redhat-appstudio-infra-deployments-main-appstudio-e2e-tests	redhat-appstudio/infra-deployments	presubmit	Registry content changed
periodic-ci-redhat-appstudio-infra-deployments-main-appstudio-e2e-tests-periodic	N/A	periodic	Registry content changed

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

flacatus · 2026-05-17T20:12:15Z

/pj-rehearse pull-ci-redhat-appstudio-infra-deployments-main-appstudio-e2e-tests

openshift-merge-bot · 2026-05-17T20:12:18Z

@flacatus: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

flacatus · 2026-05-18T07:17:40Z

/pj-rehearse pull-ci-redhat-appstudio-infra-deployments-main-appstudio-e2e-tests

openshift-merge-bot · 2026-05-18T07:17:42Z

@flacatus: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

psturc · 2026-05-18T09:08:29Z

/lgtm

openshift-ci · 2026-05-18T09:09:20Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: flacatus, psturc

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~ci-operator/step-registry/konflux-ci/install-konflux/OWNERS~~ [flacatus,psturc]
~~ci-operator/step-registry/redhat-appstudio/conformance-tests/OWNERS~~ [flacatus,psturc]

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

flacatus · 2026-05-18T09:46:17Z

/pj-rehearse pull-ci-redhat-appstudio-infra-deployments-main-appstudio-e2e-tests

openshift-merge-bot · 2026-05-18T09:46:20Z

@flacatus: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

flacatus · 2026-05-18T10:43:39Z

/pj-rehearse pull-ci-redhat-appstudio-infra-deployments-main-appstudio-e2e-tests

openshift-merge-bot · 2026-05-18T10:43:42Z

@flacatus: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

flacatus · 2026-05-18T12:01:19Z

/pj-rehearse pull-ci-redhat-appstudio-infra-deployments-main-appstudio-e2e-tests

openshift-merge-bot · 2026-05-18T12:01:22Z

@flacatus: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

flacatus · 2026-05-18T12:02:57Z

/pj-rehearse pull-ci-redhat-appstudio-infra-deployments-main-appstudio-e2e-tests

openshift-merge-bot · 2026-05-18T12:02:59Z

@flacatus: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

flacatus · 2026-05-18T13:03:32Z

/pj-rehearse pull-ci-redhat-appstudio-infra-deployments-main-appstudio-e2e-tests

openshift-merge-bot · 2026-05-18T13:03:35Z

@flacatus: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

flacatus · 2026-05-18T13:24:20Z

/pj-rehearse pull-ci-redhat-appstudio-infra-deployments-main-appstudio-e2e-tests

openshift-merge-bot · 2026-05-18T13:28:58Z

@flacatus: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

flacatus · 2026-05-18T15:22:04Z

/pj-rehearse ack

openshift-merge-bot · 2026-05-18T15:22:07Z

@flacatus: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

openshift-ci · 2026-05-18T15:46:21Z

@flacatus: The following test 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/rehearse/redhat-appstudio/infra-deployments/main/appstudio-e2e-tests	`9d9f0e7`	link	unknown	`/pj-rehearse pull-ci-redhat-appstudio-infra-deployments-main-appstudio-e2e-tests`

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.

openshift-ci Bot requested review from ifireball and psturc May 17, 2026 08:55

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 17, 2026

fix: merge Pull Request changes

9d9f0e7

Signed-off-by: flacatus <flacatus@redhat.com>

flacatus force-pushed the cxase branch from 424af10 to 9d9f0e7 Compare May 17, 2026 11:23

openshift-ci Bot assigned psturc May 18, 2026

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label May 18, 2026

openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label May 18, 2026

openshift-merge-bot Bot merged commit 054701c into openshift:main May 18, 2026
10 of 11 checks passed

flacatus deleted the cxase branch May 18, 2026 16:37

Conversation

flacatus commented May 17, 2026 • edited by coderabbitai Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Konflux CI PR Integration & Documentation (updated)

What changed (practical terms)

Practical impact

Uh oh!

coderabbitai Bot commented May 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

❌ Failed checks (1 inconclusive)

Uh oh!

flacatus commented May 17, 2026

Uh oh!

openshift-merge-bot Bot commented May 17, 2026

Uh oh!

flacatus commented May 17, 2026

Uh oh!

openshift-merge-bot Bot commented May 17, 2026

Uh oh!

konflux-ci-qe-bot commented May 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🤖 Pipeline Failure Analysis

📋 Technical Details

Immediate Cause

Contributing Factors

Impact

appstudio-e2e-tests/redhat-appstudio-conformance-tests

Uh oh!

flacatus commented May 17, 2026

Uh oh!

openshift-merge-bot Bot commented May 17, 2026

Uh oh!

openshift-merge-bot Bot commented May 17, 2026

Uh oh!

flacatus commented May 17, 2026

Uh oh!

openshift-merge-bot Bot commented May 17, 2026

Uh oh!

flacatus commented May 18, 2026

Uh oh!

openshift-merge-bot Bot commented May 18, 2026

Uh oh!

psturc commented May 18, 2026

Uh oh!

openshift-ci Bot commented May 18, 2026

Uh oh!

flacatus commented May 18, 2026

Uh oh!

openshift-merge-bot Bot commented May 18, 2026

Uh oh!

flacatus commented May 18, 2026

Uh oh!

openshift-merge-bot Bot commented May 18, 2026

Uh oh!

flacatus commented May 18, 2026

Uh oh!

openshift-merge-bot Bot commented May 18, 2026

Uh oh!

flacatus commented May 18, 2026

Uh oh!

openshift-merge-bot Bot commented May 18, 2026

Uh oh!

flacatus commented May 18, 2026

Uh oh!

openshift-merge-bot Bot commented May 18, 2026

Uh oh!

flacatus commented May 18, 2026

Uh oh!

openshift-merge-bot Bot commented May 18, 2026

Uh oh!

flacatus commented May 18, 2026

Uh oh!

openshift-merge-bot Bot commented May 18, 2026

Uh oh!

openshift-ci Bot commented May 18, 2026

Uh oh!

Uh oh!

Reviewers

flacatus commented May 17, 2026 •

edited by coderabbitai Bot

Loading

coderabbitai Bot commented May 17, 2026 •

edited

Loading

konflux-ci-qe-bot commented May 17, 2026 •

edited

Loading