Skip to content

fleetshift-ui: backend consolidation#78649

Merged
openshift-merge-bot[bot] merged 2 commits intoopenshift:mainfrom
mshort55:Hyperkid123_fleetshift-ui-consolidation_cntd
Apr 30, 2026
Merged

fleetshift-ui: backend consolidation#78649
openshift-merge-bot[bot] merged 2 commits intoopenshift:mainfrom
mshort55:Hyperkid123_fleetshift-ui-consolidation_cntd

Conversation

@mshort55
Copy link
Copy Markdown
Contributor

@mshort55 mshort55 commented Apr 30, 2026

Continuation of #78642

Summary
Replace three deleted Dockerfiles with a single Dockerfile.web in the fleetshift-user-interface repo CI config.

The UI repo consolidated its build from three separate container images (fleetshift-gui, fleetshift-mock-servers, fleetshift-mock-ui-plugins) into a single Dockerfile.web that produces all frontend static assets in one image (fleetshift-web).

Removed:

Dockerfile.gui → fleetshift-gui
Dockerfile.mock-servers → fleetshift-mock-servers
Dockerfile.mock-ui-plugins → fleetshift-mock-ui-plugins
Added:

Dockerfile.web → fleetshift-web
Related PR: fleetshift/fleetshift-user-interface#4

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Apr 30, 2026

Walkthrough

The CI configuration consolidates image build outputs from three separate images (fleetshift-gui, fleetshift-mock-servers, fleetshift-mock-ui-plugins) into a single unified image (fleetshift-web) built from Dockerfile.web, and simplifies the mirroring pipeline by replacing multiple individual jobs with a consolidated set of three standardized mirroring jobs.

Changes

Cohort / File(s) Summary
CI/CD Configuration Consolidation
ci-operator/config/fleetshift/fleetshift-user-interface/fleetshift-fleetshift-user-interface-main.yaml
Simplified image build configuration from three separate outputs to a single fleetshift-web output; consolidated image-mirror pipeline jobs from multiple PR/postsubmit variants into three unified mirroring jobs (pr-image-mirror, pr-merge-image-mirror-latest, pr-merge-image-mirror-sha) with consistent source and repository references.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

🚥 Pre-merge checks | ✅ 12
✅ Passed checks (12 passed)
Check name Status Explanation
Title check ✅ Passed The PR title 'fleetshift-ui: backend consolidation' directly matches the main change: consolidating three separate image outputs (fleetshift-gui, fleetshift-mock-servers, fleetshift-mock-ui-plugins) into a single fleetshift-web output with unified mirroring jobs.
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 PR modifies only CI operator YAML configuration with stable CI job names, not Ginkgo test code. Custom check is not applicable.
Test Structure And Quality ✅ Passed Pull request contains no Go test code modifications, only YAML CI configuration and documentation changes, making the Ginkgo test quality check inapplicable.
Microshift Test Compatibility ✅ Passed This pull request does not add any new Ginkgo e2e tests. The changes are exclusively to CI operator configuration YAML files, which consolidate image build pipelines and mirror job configurations. No Ginkgo test blocks are being introduced.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR contains only YAML configuration changes with no new Ginkgo e2e tests introduced.
Topology-Aware Scheduling Compatibility ✅ Passed Pull request only modifies CI-operator image build configuration, not deployment manifests, operator code, or scheduling constraints.
Ote Binary Stdout Contract ✅ Passed PR modifies only YAML CI configuration files with no changes to OTE binaries, test code, or stdout-affecting source code.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed This PR only modifies CI infrastructure configuration files and does not add any new Ginkgo e2e tests, so the IPv6 and disconnected network test compatibility check is not applicable.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.

✏️ 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.

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 30, 2026
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@mshort55: 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-fleetshift-fleetshift-user-interface-main-pr-image-mirror fleetshift/fleetshift-user-interface presubmit Presubmit changed
pull-ci-fleetshift-fleetshift-user-interface-main-images fleetshift/fleetshift-user-interface presubmit Ci-operator config changed

Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

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.

@mshort55
Copy link
Copy Markdown
Contributor Author

/pj-rehearse skip

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

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

@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Apr 30, 2026
@Hyperkid123
Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Apr 30, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Apr 30, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Hyperkid123, mshort55

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:

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

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Apr 30, 2026

@mshort55: all tests passed!

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-merge-bot openshift-merge-bot Bot merged commit 4faae46 into openshift:main Apr 30, 2026
16 checks passed
BATMAN-JD pushed a commit to BATMAN-JD/release that referenced this pull request May 1, 2026
* fleetshift-ui: backend consolidation

* Ran make update to generate jobs

---------

Co-authored-by: Martin Marosi <marvusm.mmi@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants