summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'smart-pipeline-duration' into 'master' Rémy Coutable2016-09-081-0/+141
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Smartly calculate real running time and pending time ## What does this MR do? Try to smartly calculate the running time and pending time for pipelines, instead of just use wall clock time from start to end. The algorithm is based on: > Suppose we have A, B, and C jobs: > * A: from 1 to 3 > * B: from 2 to 4 > * C: from 6 to 7 > The processing time should be accumulated from 1 to 4, and 6 to 7, totally 4, excluding retires, and calculate on `%w[success failed running canceled]` jobs (if a job is not finished yet, assume it's `Time.now`) ## Are there points in the code the reviewer needs to double check? I would actually like to test `Gitlab::Ci::PipelineDuration#process_segments`, but it's a private method right now and it's not very convenient to test it. Is there a way to test it without changing the original code too much? Note that I would like to avoid saving merged segments because it's not used and should be garbage collected. ## Screenshots: ![Screen_Shot_2016-09-05_at_6.45.32_PM](/uploads/a82bfaf316661091e383b743a2f11334/Screen_Shot_2016-09-05_at_6.45.32_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug ## What are the relevant issue numbers? Closes #18260, #19804 See merge request !6084
| * Struct.new could take a block for defining methods, feedback:smart-pipeline-durationLin Jen-Shin2016-09-081-2/+1
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_15091858
| * Split try_merge_period into overlap? and merge:Lin Jen-Shin2016-09-081-7/+9
| | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_15083507
| * Be more specific since it's not needed to be generic now,Lin Jen-Shin2016-09-061-3/+5
| | | | | | | | | | feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_14995016
| * Sort by database, feedback:Lin Jen-Shin2016-09-061-2/+4
| | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_14991226 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_14994233
| * Just use module because there's nothing to save, feedback:Lin Jen-Shin2016-09-061-14/+10
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_14992064
| * Use sum, feedback:Lin Jen-Shin2016-09-061-3/+1
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_14991392
| * Forget about pending duration for now, need more discussionLin Jen-Shin2016-09-051-39/+10
| |
| * Just sum all the queuing time, indication for needing more runnersLin Jen-Shin2016-09-021-6/+7
| |
| * Actually we still need to use total - running to get:Lin Jen-Shin2016-09-021-3/+4
| | | | | | | | | | | | real pending time, because that's actually by definition, (the time that it's not running!) or we could end up with awfully complicated algorithm :(
| * Merge remote-tracking branch 'upstream/master' into smart-pipeline-durationLin Jen-Shin2016-09-0228-124/+229
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (289 commits) Fix a typo Change minimum Unicorns required to two Update memory requirements Change the inline code to codeblocks for the new features doc guideline Update CHANGELOG with 8.11.4 entries. removed null return - renamed 'placeTop' to 'placeProfileAvatarsToTop' Change widths of content in MR pipeline tab Add curve to generic commit status pipeline Rubocop syntax 2.3 Some minor updates for upgrade guides for 8.12. Remove inconsistent font weight for sidebar's labels Replace play icon font with svg Project tools visibility level Added todo filter tests Fixed project filtering Review changes, simplified dropdown init Removed select2 from todos feature spec Removed inline JS and improved dropdown labels Added type and action dropdowns, need to finalize by removing all inline and polishing off the selected dropdown states Completed project filter dropdown, still need to move it from inline to ProjectSelect.js (or different) ...
| * | Calculate real queueing time to exclude gaps from:Lin Jen-Shin2016-09-021-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | retries and probably also manual actions! Feedback: * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_14735478 * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_14737804
| * | Use guard clause, feedback:Lin Jen-Shin2016-08-311-11/+9
| | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_14754681
| * | Introduction to PipelineDurationLin Jen-Shin2016-08-311-0/+98
| | |
| * | Fix renamingLin Jen-Shin2016-08-301-1/+1
| | |
| * | Avoid shadowing method name. Just use existing methodLin Jen-Shin2016-08-301-2/+2
| | |
| * | Rename to periods since it's easier to understandLin Jen-Shin2016-08-301-22/+22
| | |
| * | Use algorithm from Kamil:Lin Jen-Shin2016-08-301-28/+9
| | | | | | | | | | | | | | | Excluding sorting, this is O(n) which should be much faster and much simpler and easier to understand.
| * | build might not start yetLin Jen-Shin2016-08-301-1/+1
| | |
| * | no builds no pendingLin Jen-Shin2016-08-291-0/+2
| | |
| * | Smartly calculate real running time and pending timeLin Jen-Shin2016-08-291-0/+90
| | |
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2016-09-081-1/+2
|\ \ \ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * \ \ Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2016-09-081-1/+2
| |\ \ \
| | * | | Fixed gitlab.com importer missing confidential attributeJames Lopez2016-09-051-1/+2
| | | | |
* | | | | Merge branch 'change-update-interval-of-runners' into 'master' Yorick Peterse2016-09-082-4/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change update interval of runners when trying to preserve contacted_at See merge request !6126
| * | | | | Change update interval of runners when trying to preserve contacted_atchange-update-interval-of-runnersKamil Trzcinski2016-09-072-4/+6
| | | | | |
* | | | | | Rename `gl_user_id` to `gitlab_user_id` in importer classesAndrew Smith2016-09-086-10/+10
| |/ / / / |/| | | |
* | | | | Merge branch 'refactor/ci-config-add-logical-validation' into 'master' Rémy Coutable2016-09-0711-93/+120
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass dependencies to CI configuration nodes ## What does this MR do? This MR makes it possible to pass dependencies to CI configuration nodes. ## What are the relevant issue numbers? See #15060 ## Does this MR meet the acceptance criteria? - Tests - [x] Added for this feature/bug - [x] All builds are passing See merge request !6009
| * \ \ \ \ Merge branch 'master' into refactor/ci-config-add-logical-validationrefactor/ci-config-add-logical-validationGrzegorz Bizon2016-09-0341-244/+352
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (414 commits) Remove suggested colors hover underline Fix markdown anchor icon interaction Fix expiration date picker after update Refactored code to rely less on IDs that could change Move CHANGELOG entry for !5858 from 8.11 to 8.12 Hides merge request section in edit project when disabled Fix a typo Change minimum Unicorns required to two Update memory requirements Added `.term-bold` declaration. Change the inline code to codeblocks for the new features doc guideline Fix GitLab import button Rename behaviour to behavior in bug issue template for consistency Convert datetime coffeescript spec to ES6 Align add button on repository view Update CHANGELOG with 8.11.4 entries. removed null return - renamed 'placeTop' to 'placeProfileAvatarsToTop' Refactor Ci::Build#raw_trace Move CHANGELOG entry to a proper version Change widths of content in MR pipeline tab ... Conflicts: lib/gitlab/ci/config/node/jobs.rb
| * | | | | | Add method that returns commands for ci job entryGrzegorz Bizon2016-08-292-7/+7
| | | | | | |
| * | | | | | Do not override job nodes in legacy ci config codeGrzegorz Bizon2016-08-291-5/+5
| | | | | | |
| * | | | | | Make it possible to inherit global ci config nodesGrzegorz Bizon2016-08-291-0/+15
| | | | | | |
| * | | | | | Add [] method for accessing ci entry dependenciesGrzegorz Bizon2016-08-251-0/+4
| | | | | | |
| * | | | | | Remove temporary stub method from ci config nodesGrzegorz Bizon2016-08-253-8/+2
| | | | | | |
| * | | | | | Expose compose method in the ci config entry nodesGrzegorz Bizon2016-08-256-44/+47
| | | | | | |
| * | | | | | Rename unspecified and undefined CI config nodesGrzegorz Bizon2016-08-254-42/+46
| | | | | | |
| * | | | | | Inject dependencies into each CI config entry nodeGrzegorz Bizon2016-08-255-8/+15
| | | | | | |
* | | | | | | Merge branch 'fix-allowed-conflict-size' into 'master' Rémy Coutable2016-09-071-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix merge conflict size limit ## What does this MR do? The merge conflict size limit was set to 100 KB, but the docs (and the test repo, which the feature specs use) say 200 KB! ## Are there points in the code the reviewer needs to double check? Don't think so. ## Why was this MR needed? Derp. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6052
| * | | | | | | Fix merge conflict size limitfix-allowed-conflict-sizeSean McGivern2016-09-071-1/+1
| | | | | | | |
* | | | | | | | Use PipelinesFinder in Pipelines APIZ.J. van de Weg2016-09-071-1/+4
|/ / / / / / /
* | | | | | | Improve curl commend, remove blank linesKatarzyna Kobierska2016-09-071-2/+0
| | | | | | |
* | | | | | | Fix invalid curl commandKatarzyna Kobierska2016-09-071-4/+5
| | | | | | |
* | | | | | | Add Documentation to Ci Lint APIKatarzyna Kobierska2016-09-071-3/+3
| | | | | | |
* | | | | | | Code refactorKatarzyna Kobierska2016-09-072-1/+2
| | | | | | |
* | | | | | | Improve codeKatarzyna Kobierska2016-09-072-23/+16
| | | | | | |
* | | | | | | Code refactoringKatarzyna Kobierska2016-09-072-31/+28
| | | | | | |
* | | | | | | Fix errors and grammarKatarzyna Kobierska2016-09-071-13/+10
| | | | | | |
* | | | | | | Fix rubocop errorsKatarzyna Kobierska2016-09-071-1/+1
| | | | | | |
* | | | | | | Change class method nameKatarzyna Kobierska2016-09-072-5/+5
| | | | | | |
* | | | | | | Add class method to encapsulate exceptionKatarzyna Kobierska2016-09-072-18/+25
| | | | | | |
View Lorry Controller Status