[TBT-84] Enterprise merge #314
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
keep netrc
Added preferences method implementation to User and Organization classes.
When we migrate a build history it's possible that some jobs are still running on .org. We shouldn't count them towards concurrency limits because they're technically running on .org
When we migrate build history some of the builds may be in the created state. We don't want to enqueue them as then they would be running on both platforms.
ws_config is a Hashr, which doesn't have `#key?`
*_settings is redundant.
…190) I've already attempted it to fix the problem in 01139a4, but I only fixed one code path, which is currently not used, so the changes didn't go into effect. This commit applies the changes to the other code path as well. The reason we need to do it is because when we migrate jobs from .org to .com they might still be in a state that is considered by gatekeeper. So they might be started but they're running on .org not .com, thus we shouldn't count them as running on .com. The same with new jobs - we don't want to start them as they would start on .org anyway. I decided to filter these jobs in code instead of in the database because the number of jobs that we fetch from the database is relatively small and if I had to do it in the DB I would have to always join jobs with repositories, which actually might be slower.
cherry pick commits from the public repo
This reverts commit 455b3f0.
This reverts commit e8f725d.
Allow ARM builds for Open Source only
Allow IBM power builds for Open Source only
Allow IBM z builds for Open Source only
Revert "Allow IBM z builds for Open Source only"
* upgrade gems * Do not cache bundler * force bundler -v 2.3.7 * sharing envs to forks (#272) * repo settings merge from master * slow scheduler fix (#273) * scheduler performance issue fix * New sidekiq does not have -i / --index option * Force timestamp * Parse config if it is a string Co-authored-by: Maciej <[email protected]> Co-authored-by: gabriel-arc <[email protected]>
* merge from master 14.11.22 * ship:docker * bundler updated to 2.3.24
Stop cancelled build jobs from being queued
queue the job if there is an exception
Restrict ruby gem-update to 3.4.22 because it still supports ruby 2.6
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.