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

chore(gh-ci): CI is failing to test upgrade correctly (DSP-667) #1773

Merged
merged 19 commits into from Dec 14, 2020

Conversation

subotic
Copy link
Collaborator

@subotic subotic commented Dec 10, 2020

  • resolves DSP-667
  • relsolves DSP-1113
  • refactor: move IT tests to "test" folder
  • remove KnoraSipiScriptsV1ITSpec.scala (see DSP-707 for explanation)

@subotic subotic self-assigned this Dec 10, 2020
@subotic subotic added the chore maintenance and build tasks label Dec 14, 2020
Copy link

@benjamingeer benjamingeer left a comment

Choose a reason for hiding this comment

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

Thanks very much, this is a big improvement. Could we also get rid of salsah1/src/test/scala/org/knora/salsah/TestContainers.scala?

@subotic
Copy link
Collaborator Author

subotic commented Dec 14, 2020

Could we also get rid of salsah1/src/test/scala/org/knora/salsah/TestContainers.scala?

Hmm, the salsah1 tree is completely independent of the webapi tree, i.e., nothing is shared. If we break this isolation, then it will be more work to maintain the whole thing. Any changes in webapi could then potentially break something in salsah1. Maybe it would be better to extract salsah1 out of the dsp-api repository?

@benjamingeer
Copy link

Maybe it would be better to extract salsah1 out of the dsp-api repository?

You're right, that makes more sense. Would you rather make another PR for that?

@subotic
Copy link
Collaborator Author

subotic commented Dec 14, 2020

Maybe it would be better to extract salsah1 out of the dsp-api repository?

You're right, that makes more sense. Would you rather make another PR for that?

yes, I can make another PR for that.

@subotic subotic merged commit 13cbdab into main Dec 14, 2020
@subotic subotic deleted the wip/DSP-667-ci-upgrade-test branch December 14, 2020 12:35
@kilchenmann kilchenmann changed the title DSP-667 CI is failing to test upgrade correctly chore(gh-ci): CI is failing to test upgrade correctly (DSP-667) Jan 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore maintenance and build tasks
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants