Skip to content

fix(operator-bundle): use common environment and don't append #14257

Merged
tommartensen merged 9 commits intomasterfrom
tm/operator-bundle-helpers-improvements
Feb 17, 2025
Merged

fix(operator-bundle): use common environment and don't append #14257
tommartensen merged 9 commits intomasterfrom
tm/operator-bundle-helpers-improvements

Conversation

@tommartensen
Copy link
Contributor

@tommartensen tommartensen commented Feb 13, 2025 •
edited
Loading

Description

fix:

Long-term: https://issues.redhat.com/browse/ROX-27677
--> replace this Python carfuffle with Go.

Why are so many transitive dependencies removed in Konflux requirements?

  1. Dropping pytest. It has no value for Konflux (at the moment).
  2. Previously, we generated an intermediate result with --append. Therefore, we included some results in the final requirements file that were artifacts from development.

User-facing documentation

Testing and quality

  • the change is production ready: the change is GA or otherwise the functionality is gated by a feature flag
  • CI results are inspected

Automated testing

  • added unit tests
  • added e2e tests
  • added regression tests
  • added compatibility tests
  • modified existing tests

How I validated my change

Konflux and GH builds pass.
There are no changes when running the steps from the README on different engineers' machines.

@tommartensen tommartensen added the konflux-build Run Konflux in PR. Push commit to trigger it. label Feb 13, 2025
@tommartensen tommartensen self-assigned this Feb 13, 2025
@openshift-ci
Copy link

openshift-ci bot commented Feb 13, 2025

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

@rhacs-bot
Copy link
Contributor

rhacs-bot commented Feb 13, 2025 •
edited
Loading

Images are ready for the commit at 817a312.

To use with deploy scripts, first export MAIN_IMAGE_TAG=4.8.x-23-g817a312c46.

@codecov
Copy link

codecov bot commented Feb 13, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 49.04%. Comparing base (ea89b47) to head (f91a1f1).
Report is 13 commits behind head on master.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master   #14257      +/-   ##
==========================================
- Coverage   49.07%   49.04%   -0.04%     
==========================================
  Files        2514     2514              
  Lines      182769   182854      +85     
==========================================
- Hits        89702    89687      -15     
- Misses      85947    86044      +97     
- Partials     7120     7123       +3
Flag Coverage Δ
go-unit-tests 49.04% <ø> (-0.04%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@tommartensen
Copy link
Contributor Author

tommartensen commented Feb 13, 2025

/test operator-bundle-on-push

@openshift-ci
Copy link

openshift-ci bot commented Feb 13, 2025

@tommartensen: No presubmit jobs available for stackrox/stackrox@mc/operator-bundle-helpers-version-update-2

Details

In response to this:

/test operator-bundle-on-push

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.

@tommartensen
Copy link
Contributor Author

tommartensen commented Feb 13, 2025

/test main-on-push

@openshift-ci
Copy link

openshift-ci bot commented Feb 13, 2025

@tommartensen: No presubmit jobs available for stackrox/stackrox@mc/operator-bundle-helpers-version-update-2

Details

In response to this:

/test main-on-push

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.

@tommartensen
Copy link
Contributor Author

tommartensen commented Feb 13, 2025

/test main-on-push

@openshift-ci
Copy link

openshift-ci bot commented Feb 13, 2025

@tommartensen: No presubmit jobs available for stackrox/stackrox@mc/operator-bundle-helpers-version-update-2

Details

In response to this:

/test main-on-push

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.

@tommartensen
Copy link
Contributor Author

tommartensen commented Feb 14, 2025

/test operator-bundle-on-push

@openshift-ci
Copy link

openshift-ci bot commented Feb 14, 2025

@tommartensen: No presubmit jobs available for stackrox/stackrox@mc/operator-bundle-helpers-version-update-2

Details

In response to this:

/test operator-bundle-on-push

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.

@tommartensen tommartensen force-pushed the tm/operator-bundle-helpers-improvements branch from 807df97 to b57d7d8 Compare February 14, 2025 09:26
@tommartensen tommartensen force-pushed the tm/operator-bundle-helpers-improvements branch from b57d7d8 to 3c58339 Compare February 17, 2025 10:06
@tommartensen tommartensen changed the base branch from mc/operator-bundle-helpers-version-update-2 to master February 17, 2025 10:08
@tommartensen tommartensen added the backport-for-4.6-konflux-release https://redhat-internal.slack.com/archives/C05TS9N0S7L/p1730134914487439 label Feb 17, 2025
@tommartensen tommartensen changed the title fix: do not append to the build.in file and code environment fix(operator-bundle): use common environment and don't append Feb 17, 2025
@tommartensen tommartensen added the backport-for-4.7-konflux-release https://redhat-internal.slack.com/archives/C05TS9N0S7L/p1739787699448879 label Feb 17, 2025
@tommartensen tommartensen marked this pull request as ready for review February 17, 2025 10:28
@tommartensen tommartensen requested a review from a team as a code owner February 17, 2025 10:28
@tommartensen tommartensen requested review from GrimmiMeloni and removed request for a team February 17, 2025 10:28
@tommartensen tommartensen requested review from a team and mclasmeier February 17, 2025 10:28
@tommartensen tommartensen enabled auto-merge (squash) February 17, 2025 10:28
@msugakov msugakov mentioned this pull request Feb 17, 2025
Closed
9 tasks
mclasmeier
mclasmeier approved these changes Feb 17, 2025
View reviewed changes
Copy link
Contributor

@mclasmeier mclasmeier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, hopefully CI is also happy.

@mclasmeier mclasmeier mentioned this pull request Feb 17, 2025
Closed
9 tasks
msugakov
msugakov reviewed Feb 17, 2025
View reviewed changes
Copy link
Contributor

@msugakov msugakov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a worthwhile improvement.
I have few comments/suggestions.

@tommartensen tommartensen enabled auto-merge (squash) February 17, 2025 11:56
msugakov
msugakov reviewed Feb 17, 2025
View reviewed changes
@openshift-ci
Copy link

openshift-ci bot commented Feb 17, 2025 •
edited
Loading

@tommartensen: 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/prow/ocp-4-12-nongroovy-e2e-tests 817a312 link false /test ocp-4-12-nongroovy-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.

@tommartensen tommartensen merged commit 5b14b92 into master Feb 17, 2025
90 of 107 checks passed
@tommartensen tommartensen deleted the tm/operator-bundle-helpers-improvements branch February 17, 2025 15:16
ajheflin pushed a commit that referenced this pull request Jun 24, 2025
@tommartensen @ajheflin
fix(operator-bundle): use common environment and don't append (#14257)
89a62b6 
Co-authored-by: Moritz Clasmeier <mclasmeier@redhat.com>
msugakov pushed a commit that referenced this pull request Jun 27, 2025
@tommartensen @msugakov
fix(operator-bundle): use common environment and don't append (#14257)
700c208 
Co-authored-by: Moritz Clasmeier <mclasmeier@redhat.com>
ajheflin pushed a commit that referenced this pull request Jun 27, 2025
@tommartensen @ajheflin
fix(operator-bundle): use common environment and don't append (#14257)
0dbd154 
Co-authored-by: Moritz Clasmeier <mclasmeier@redhat.com>
msugakov pushed a commit that referenced this pull request Jun 27, 2025
@tommartensen @msugakov
fix(operator-bundle): use common environment and don't append (#14257)
51c1c92 
Co-authored-by: Moritz Clasmeier <mclasmeier@redhat.com>
msugakov pushed a commit that referenced this pull request Jul 1, 2025
@tommartensen @msugakov
fix(operator-bundle): use common environment and don't append (#14257)
23a8902 
Co-authored-by: Moritz Clasmeier <mclasmeier@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@msugakov msugakov msugakov approved these changes

@mclasmeier mclasmeier mclasmeier approved these changes

@GrimmiMeloni GrimmiMeloni Awaiting requested review from GrimmiMeloni GrimmiMeloni is a code owner automatically assigned from stackrox/install

Assignees

@tommartensen tommartensen

Labels

area/operator backport-for-4.6-konflux-release https://redhat-internal.slack.com/archives/C05TS9N0S7L/p1730134914487439 backport-for-4.7-konflux-release https://redhat-internal.slack.com/archives/C05TS9N0S7L/p1739787699448879 konflux-build Run Konflux in PR. Push commit to trigger it.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@tommartensen @rhacs-bot @msugakov @mclasmeier