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): scorecard test for Cryostat CR configuration changes (backport #739) #756

Merged
merged 2 commits into from
Mar 8, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 8, 2024

This is an automatic backport of pull request #739 done by Mergify.
Cherry-pick of bf8df15 has failed:

On branch mergify/bp/cryostat3/pr-739
Your branch is up to date with 'origin/cryostat3'.

You are currently cherry-picking commit bf8df15.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   bundle/tests/scorecard/config.yaml
	modified:   config/scorecard/patches/custom.config.yaml
	modified:   go-license.yml
	modified:   hack/custom.config.yaml.in
	modified:   internal/images/custom-scorecard-tests/main.go
	modified:   internal/test/scorecard/clients.go
	modified:   internal/test/scorecard/common_utils.go
	modified:   internal/test/scorecard/tests.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   bundle/manifests/cryostat-operator.clusterserviceversion.yaml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…#739)

* CR config scorecard

* reformat

* reviews

* add kubectl license

(cherry picked from commit bf8df15)

# Conflicts:
#	bundle/manifests/cryostat-operator.clusterserviceversion.yaml
@mergify mergify bot added the conflicts label Mar 8, 2024
Copy link
Contributor Author

mergify bot commented Mar 8, 2024

Cherry-pick of bf8df15 has failed:

On branch mergify/bp/cryostat3/pr-739
Your branch is up to date with 'origin/cryostat3'.

You are currently cherry-picking commit bf8df15.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   bundle/tests/scorecard/config.yaml
	modified:   config/scorecard/patches/custom.config.yaml
	modified:   go-license.yml
	modified:   hack/custom.config.yaml.in
	modified:   internal/images/custom-scorecard-tests/main.go
	modified:   internal/test/scorecard/clients.go
	modified:   internal/test/scorecard/common_utils.go
	modified:   internal/test/scorecard/tests.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   bundle/manifests/cryostat-operator.clusterserviceversion.yaml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ebaron ebaron added test and removed conflicts labels Mar 8, 2024
@ebaron
Copy link
Member

ebaron commented Mar 8, 2024

/build_test

Copy link

github-actions bot commented Mar 8, 2024

/build_test completed successfully ✅.
View Actions Run.

@ebaron ebaron merged commit 385f81e into cryostat3 Mar 8, 2024
7 checks passed
@mergify mergify bot deleted the mergify/bp/cryostat3/pr-739 branch March 8, 2024 18:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants