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(storage): deploy cryostat-storage rather than localstack (backport #764) #769

Merged
merged 2 commits into from
Jan 7, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 7, 2025

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 using a GPG signature

To recreate commits with GPG signature git fetch upstream && git rebase --force --gpg-sign upstream/main


Related to #759

Description of the change:

Sets up the tests (unit and integration) to deploy cryostat-storage rather than localstack as the S3 storage instance.

Motivation for the change:

This allows us to have some level of automated integration testing between Cryostat and our SeaweedFS soft fork to ensure things are working as expected.

How to manually test:

  1. Run CRYOSTAT_IMAGE=quay.io... bash smoketest.bash...
  2. ...

This is an automatic backport of pull request #764 done by [Mergify](https://mergify.com).

(cherry picked from commit b913b87)

# Conflicts:
#	src/test/java/io/cryostat/resources/S3StorageResource.java
Copy link
Author

mergify bot commented Jan 7, 2025

Cherry-pick of b913b87 has failed:

On branch mergify/bp/cryostat-v3.0/pr-764
Your branch is up to date with 'origin/cryostat-v3.0'.

You are currently cherry-picking commit b913b87.
  (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:
	deleted:    src/test/java/io/cryostat/resources/LocalStackResource.java
	modified:   src/test/java/itest/CustomEventTemplateTest.java
	modified:   src/test/java/itest/GraphQLTest.java
	modified:   src/test/java/itest/RecordingWorkflowTest.java
	modified:   src/test/java/itest/ReportGenerationTest.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/test/java/io/cryostat/resources/S3StorageResource.java

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

@andrewazores
Copy link
Member

/build_test

Copy link

github-actions bot commented Jan 7, 2025

Workflow started at 1/7/2025, 12:17:26 PM. View Actions Run.

Copy link

github-actions bot commented Jan 7, 2025

No OpenAPI schema changes detected.

Copy link

github-actions bot commented Jan 7, 2025

No GraphQL schema changes detected.

Copy link

github-actions bot commented Jan 7, 2025

CI build and push: All tests pass ✅
https://github.com/cryostatio/cryostat/actions/runs/12656052306

@andrewazores andrewazores merged commit a9a0828 into cryostat-v3.0 Jan 7, 2025
14 of 15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant