Skip to content
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.

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

test(scorecard): retry on cryostat update conflict #774

Merged
merged 3 commits into from
Apr 16, 2024

Conversation

mwangggg
Copy link
Member

Welcome to Cryostat! 👋

Before contributing, make sure you have:

  • Read the contributing guidelines
  • Linked a relevant issue which this PR resolves
  • Linked any other relevant issues, PR's, or documentation, if any
  • Resolved all conflicts, if any
  • Rebased your branch PR on top of the latest upstream main branch
  • Attached at least one of the following labels to the PR: [chore, ci, docs, feat, fix, test]
  • Signed all commits: git commit -S -m "YOUR_COMMIT_MESSAGE"

Fixes: #757

@mergify mergify bot added the safe-to-test label Mar 26, 2024
@mwangggg mwangggg requested review from tthvo and ebaron March 26, 2024 13:44
@mwangggg mwangggg force-pushed the 757-config-conflict branch 4 times, most recently from d567ae5 to d29db67 Compare April 9, 2024 15:15
@mwangggg
Copy link
Member Author

mwangggg commented Apr 9, 2024

/build_test

Copy link

github-actions bot commented Apr 9, 2024

/build_test : At least one test failed ❌.
View Actions Run.

@mwangggg
Copy link
Member Author

mwangggg commented Apr 9, 2024

/build_test

Copy link

github-actions bot commented Apr 9, 2024

/build_test : At least one test failed ❌.
View Actions Run.

@tthvo tthvo added the test label Apr 9, 2024
@tthvo
Copy link
Member

tthvo commented Apr 9, 2024

The test failure seems to be the same as #774 (comment). Maybe rebase lost the changes?

@mwangggg mwangggg force-pushed the 757-config-conflict branch from 06f6260 to 2f7b5e6 Compare April 10, 2024 02:34
@mwangggg
Copy link
Member Author

/build_test

Copy link

/build_test : At least one test failed ❌.
View Actions Run.

@mwangggg
Copy link
Member Author

/build_test

Copy link

/build_test completed successfully ✅.
View Actions Run.

ebaron
ebaron previously approved these changes Apr 16, 2024
Copy link
Member

@ebaron ebaron left a comment

Choose a reason for hiding this comment

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

Looks good, thanks @mwangggg! Just needs a rebase with make scorecard-build MANIFEST_PUSH=false bundle.

@mwangggg mwangggg force-pushed the 757-config-conflict branch from 2ee1241 to bf29937 Compare April 16, 2024 20:47
@mwangggg
Copy link
Member Author

/build_test

Copy link

/build_test completed successfully ✅.
View Actions Run.

@ebaron ebaron merged commit d7b0379 into cryostatio:main Apr 16, 2024
7 checks passed
@ebaron
Copy link
Member

ebaron commented Apr 16, 2024

@Mergifyio backport cryostat3

Copy link
Contributor

mergify bot commented Apr 16, 2024

backport cryostat3

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Apr 16, 2024
* retry on cryostat update conflict

* review

* review

(cherry picked from commit d7b0379)

# Conflicts:
#	bundle/manifests/cryostat-operator.clusterserviceversion.yaml
#	bundle/tests/scorecard/config.yaml
#	config/scorecard/patches/custom.config.yaml
#	internal/test/scorecard/common_utils.go
#	internal/test/scorecard/tests.go
ebaron added a commit that referenced this pull request Apr 16, 2024
)

* test(scorecard): retry on cryostat update conflict (#774)

* retry on cryostat update conflict

* review

* review

(cherry picked from commit d7b0379)

# Conflicts:
#	bundle/manifests/cryostat-operator.clusterserviceversion.yaml
#	bundle/tests/scorecard/config.yaml
#	config/scorecard/patches/custom.config.yaml
#	internal/test/scorecard/common_utils.go
#	internal/test/scorecard/tests.go

* Fix conflicts

---------

Co-authored-by: Ming Yu Wang <[email protected]>
Co-authored-by: Elliott Baron <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

[Bug] Config changes Scorecard test can fail due to conflcting update
3 participants