Skip to content

🌱 [Monorepo]: Combine upgrade e2e tests from catalogd into operator-controller #1780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Feb 17, 2025
Merged

🌱 [Monorepo]: Combine upgrade e2e tests from catalogd into operator-controller #1780

merged 1 commit into from
Feb 17, 2025

Conversation

camilamacedo86
Copy link
Contributor

@camilamacedo86 camilamacedo86 commented Feb 14, 2025 •
edited
Loading

Closes: #1712

@camilamacedo86 camilamacedo86 requested a review from a team as a code owner February 14, 2025 19:10
@netlify Netlify
Copy link

netlify bot commented Feb 14, 2025 •
edited
Loading

✅ Deploy Preview for olmv1 ready!

Name Link
🔨 Latest commit 1285486
🔍 Latest deploy log https://app.netlify.com/sites/olmv1/deploys/67b33174f27b580008078b98
😎 Deploy Preview https://deploy-preview-1780--olmv1.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@camilamacedo86 camilamacedo86 changed the title 🌱 [Monorepo]: Combine upgrade e2e tests from catalogd into operator-controller WIP: 🌱 [Monorepo]: Combine upgrade e2e tests from catalogd into operator-controller Feb 14, 2025
@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 Feb 14, 2025
@camilamacedo86 camilamacedo86 changed the title WIP: 🌱 [Monorepo]: Combine upgrade e2e tests from catalogd into operator-controller 🌱 [Monorepo]: Combine upgrade e2e tests from catalogd into operator-controller Feb 14, 2025
@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 Feb 14, 2025
@codecov Codecov
Copy link

codecov bot commented Feb 14, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.34%. Comparing base (7f00b13) to head (1285486).
Report is 1 commits behind head on main.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #1780      +/-   ##
==========================================
- Coverage   68.39%   68.34%   -0.06%     
==========================================
  Files          63       63              
  Lines        5117     5117              
==========================================
- Hits         3500     3497       -3     
- Misses       1388     1390       +2     
- Partials      229      230       +1
Flag Coverage Δ
e2e 51.62% <ø> (-0.16%) ⬇️
unit 55.91% <ø> (ø)

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.

camilamacedo86
camilamacedo86 commented Feb 14, 2025
View reviewed changes
catalogd/testdata/catalogs/test-catalog.Dockerfile Outdated

# Set DC-specific label for the location of the DC root directory
# in the image
LABEL operators.operatorframework.io.index.configs.v1=/configs
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@tmshort for we do not break the bumper: openshift/release#61681

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm actually thinking we may want to keep this Dockerfile around until openshift/release#61681 is merged.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done, I reverted this one

tmshort
tmshort reviewed Feb 14, 2025
View reviewed changes
go.mod
Comment on lines -18 to -19
github.com/onsi/ginkgo/v2 v2.22.2
github.com/onsi/gomega v1.36.2
Copy link
Contributor

Choose a reason for hiding this comment

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

Woohoo!

@camilamacedo86
Copy link
Contributor Author

@tmshort rebased :-)

@tmshort
Copy link
Contributor

tmshort commented Feb 14, 2025 •
edited
Loading

We may need to wait for openshift/release#61681 to merge first before we downstream.

@tmshort
Copy link
Contributor

tmshort commented Feb 14, 2025

Now I'm thinking we may want to keep that dockerfile around until this downstreams and openshift/release#61681 merges.

@tmshort
Copy link
Contributor

tmshort commented Feb 17, 2025

Yeah, openshift/release#61681 is failing rehearsals because it stops building the test-catalog which is still required as far as it knows. So, we should merge this (since the test-catalog Dockerfile deletion was reverted), wait for this to downstream, then merge openshift/release#61681, then we can get rid of that Dockerfile.

@tmshort tmshort mentioned this pull request Feb 17, 2025
Merged
tmshort
tmshort approved these changes Feb 17, 2025
View reviewed changes
Copy link
Contributor

@tmshort tmshort left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 17, 2025
@tmshort tmshort added this pull request to the merge queue Feb 17, 2025
Merged via the queue into operator-framework:main with commit e7dabc2 Feb 17, 2025
20 of 21 checks passed
@camilamacedo86 camilamacedo86 deleted the combine-phase-2-e2e branch February 17, 2025 17:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tmshort tmshort tmshort approved these changes

Assignees

@tmshort tmshort

Labels
lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Consolidate E2E Tests Between Catalogd and Operator-Controller
2 participants
@camilamacedo86 @tmshort