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

[4.0.x] test: fix failing tests due to the new syncFrom property #7416

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented May 7, 2024

This is an automatic copy of pull request #7387 done by Mergify.


see https://gravitee.atlassian.net/browse/GKO-195


Cherry-pick of 73eab88 has failed:

On branch mergify/bp/4.0.x/pr-7387
Your branch is up to date with 'origin/4.0.x'.

You are currently cherry-picking commit 73eab884f1.
  (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:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/import-new-kubernetes-api.definition.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gravitee-apim-repository/gravitee-apim-repository-test/src/test/java/io/gravitee/repository/management/ApiRepositoryTest.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

(cherry picked from commit 73eab88)

# Conflicts:
#	gravitee-apim-repository/gravitee-apim-repository-test/src/test/java/io/gravitee/repository/management/ApiRepositoryTest.java
@mergify mergify bot requested a review from a team as a code owner May 7, 2024 15:57
@mergify mergify bot added the conflicts label May 7, 2024
Copy link
Author

mergify bot commented May 7, 2024

Cherry-pick of 73eab88 has failed:

On branch mergify/bp/4.0.x/pr-7387
Your branch is up to date with 'origin/4.0.x'.

You are currently cherry-picking commit 73eab884f1.
  (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:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/resources/io/gravitee/rest/api/management/service/import-new-kubernetes-api.definition.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gravitee-apim-repository/gravitee-apim-repository-test/src/test/java/io/gravitee/repository/management/ApiRepositoryTest.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

@kamiiiel kamiiiel closed this May 7, 2024
@mergify mergify bot deleted the mergify/bp/4.0.x/pr-7387 branch May 7, 2024 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants