Skip to content

USHIFT-6682: Reenable gitops test#6328

Merged
openshift-merge-bot[bot] merged 3 commits intoopenshift:mainfrom
pmtk:reenable-gitops-test
Mar 10, 2026
Merged

USHIFT-6682: Reenable gitops test#6328
openshift-merge-bot[bot] merged 3 commits intoopenshift:mainfrom
pmtk:reenable-gitops-test

Conversation

@pmtk
Copy link
Copy Markdown
Member

@pmtk pmtk commented Mar 9, 2026

Summary by CodeRabbit

  • Chores
    • Updated GitOps package version to 1.19 (was 1.16).
    • Adjusted test scenarios and boot-source configuration to support the updated GitOps flows.
    • Added a harmless, deprecated shim for script exit logging to maintain compatibility with existing tooling.

@pmtk
Copy link
Copy Markdown
Member Author

pmtk commented Mar 9, 2026

/test ?

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 9, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Mar 9, 2026

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Mar 9, 2026

Walkthrough

GITOPS_VERSION updated from 1.16 to 1.19 in version sources; a gitops-specific boot source and the suites/gitops/ test suite were added to a boot scenario script; a new no-op shim function log_script_exit() was added to packaging/greenboot/functions.sh.

Changes

Cohort / File(s) Summary
Version Updates
test/bin/common_versions.sh, test/bin/pyutils/generate_common_versions.py
Bumped GITOPS_VERSION from 1.16 to 1.19 (shell and Python).
Test Suite Configuration
test/scenarios-bootc/periodics/el98-src@gitops-telemetry-clusterid-systemd.sh
Swapped rhel98-bootc-source for rhel98-bootc-source-gitops; added suites/gitops/ to run_tests; removed two TODO comment blocks.
Greenboot function
packaging/greenboot/functions.sh
Added new no-op shim function log_script_exit() that prints a deprecation message and is a placeholder.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 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.
Docstring Coverage ✅ Passed Docstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.
Stable And Deterministic Test Names ✅ Passed PR does not modify Ginkgo test files with dynamic test names; Robot Framework tests use static descriptive names.
Test Structure And Quality ✅ Passed PR contains no Ginkgo test files; modifications are limited to configuration and utility scripts.
Title check ✅ Passed The title 'USHIFT-6682: Reenable gitops test' directly relates to the main objective of re-enabling gitops tests by updating GITOPS_VERSION and adding test suite configurations.

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

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 Mar 9, 2026
@pmtk
Copy link
Copy Markdown
Member Author

pmtk commented Mar 9, 2026

/test e2e-aws-tests-bootc-periodic e2e-aws-tests-bootc-periodic-arm

Copy link
Copy Markdown

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

🧹 Nitpick comments (1)
packaging/greenboot/functions.sh (1)

142-144: Document that this is an intentional compatibility shim.

A bare no-op here is fine, but without a short comment explaining which caller expects log_script_exit(), this looks removable during cleanup. Please add one line clarifying that it exists to satisfy the gitops script hook.

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@packaging/greenboot/functions.sh` around lines 142 - 144, Add a one-line
comment to the no-op function log_script_exit clarifying it is an intentional
compatibility shim kept to satisfy the gitops script hook (i.e., a caller
outside this module expects this function), so it isn't removed during cleanup;
place the brief comment immediately above or inside the log_script_exit function
body mentioning "compat shim for gitops script hook" and leave the function body
as a no-op.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Nitpick comments:
In `@packaging/greenboot/functions.sh`:
- Around line 142-144: Add a one-line comment to the no-op function
log_script_exit clarifying it is an intentional compatibility shim kept to
satisfy the gitops script hook (i.e., a caller outside this module expects this
function), so it isn't removed during cleanup; place the brief comment
immediately above or inside the log_script_exit function body mentioning "compat
shim for gitops script hook" and leave the function body as a no-op.

ℹ️ Review info
⚙️ Run configuration

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

Review profile: CHILL

Plan: Pro

Run ID: c7688848-63ca-4046-b2a3-497dedaa94b2

📥 Commits

Reviewing files that changed from the base of the PR and between 68cb883 and 5c4f981.

📒 Files selected for processing (1)
  • packaging/greenboot/functions.sh

@pmtk pmtk force-pushed the reenable-gitops-test branch from 5c4f981 to 2666f75 Compare March 9, 2026 13:48
@pmtk
Copy link
Copy Markdown
Member Author

pmtk commented Mar 9, 2026

/test e2e-aws-tests-bootc-periodic e2e-aws-tests-bootc-periodic-arm

@pmtk pmtk marked this pull request as ready for review March 10, 2026 08:09
@pmtk pmtk changed the title wip Reenable gitops test USHIFT-6682: Reenable gitops test Mar 10, 2026
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Mar 10, 2026
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Mar 10, 2026

@pmtk: This pull request references USHIFT-6682 which is a valid jira issue.

Details

In response to this:

Summary by CodeRabbit

  • Chores
  • Updated GitOps package version to 1.19 (was 1.16).
  • Adjusted test scenarios and boot-source configuration to support the updated GitOps flows.
  • Added a harmless, deprecated shim for script exit logging to maintain compatibility with existing tooling.

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 10, 2026
@openshift-ci openshift-ci bot requested review from eslutsky and kasturinarra March 10, 2026 08:10
@ggiguash
Copy link
Copy Markdown
Contributor

/lgtm

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

openshift-ci bot commented Mar 10, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ggiguash, pmtk

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

@pmtk
Copy link
Copy Markdown
Member Author

pmtk commented Mar 10, 2026

/verified by ci

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Mar 10, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@pmtk: This PR has been marked as verified by ci.

Details

In response to this:

/verified by ci

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 openshift-eng/jira-lifecycle-plugin repository.

@pmtk
Copy link
Copy Markdown
Member Author

pmtk commented Mar 10, 2026

/retest

@ggiguash
Copy link
Copy Markdown
Contributor

/retest-required

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Mar 10, 2026

@pmtk: 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 38f7660 into openshift:main Mar 10, 2026
16 checks passed
@pmtk pmtk deleted the reenable-gitops-test branch March 11, 2026 07:45
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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants