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): add container logs for report sidecard test (backport #772) #796

Merged
merged 2 commits into from
Apr 16, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 16, 2024

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"

Related to #758

Description of the change:

  • Extended container logging goroutine to support report sidecar.
    • I was not sure if you meant to request it to be added in other tests too so I added only to report test now. Please let me know if you need it in others too :D
  • Formatted log output with some headers that include namespace, pod name, and container name.

Motivation for the change:

It would be cool in a follow up PR if we could get this working for other tests too. Like for the reports test, it would good to see the logs from the reports container too.

Originally posted by @ebaron in #758 (review)

Sample

https://gist.github.com/tthvo/3ec9f94f55aa1a376f4d2bc18069d5d7


This is an automatic backport of pull request #772 done by Mergify.

* test(scorecard): add container logs for report sidecard test

odified:   internal/test/scorecard/common_utils.go

* test(scorecard): clean up

(cherry picked from commit 4b8ad76)

# Conflicts:
#	bundle/manifests/cryostat-operator.clusterserviceversion.yaml
#	bundle/tests/scorecard/config.yaml
#	config/scorecard/patches/custom.config.yaml
#	internal/test/scorecard/logger.go
@mergify mergify bot added the conflicts label Apr 16, 2024
Copy link
Contributor Author

mergify bot commented Apr 16, 2024

Cherry-pick of 4b8ad76 has failed:

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

You are currently cherry-picking commit 4b8ad76.
  (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:   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
	both modified:   bundle/tests/scorecard/config.yaml
	both modified:   config/scorecard/patches/custom.config.yaml
	both modified:   internal/test/scorecard/logger.go

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
Copy link
Member

ebaron commented Apr 16, 2024

/build_test

@ebaron ebaron added test and removed conflicts labels Apr 16, 2024
Copy link

/build_test completed successfully ✅.
View Actions Run.

@ebaron ebaron merged commit f799098 into cryostat3 Apr 16, 2024
7 checks passed
@mergify mergify bot deleted the mergify/bp/cryostat3/pr-772 branch April 16, 2024 19:38
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