Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
ab0ec603
Commit
ab0ec603
authored
Jun 30, 2020
by
Doug Stull
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add running out alert to pipeline job
- add this in the UI for pipeline job for better visibility.
parent
e22534e9
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
32 additions
and
15 deletions
+32
-15
.haml-lint_todo.yml
.haml-lint_todo.yml
+0
-1
app/views/projects/jobs/show.html.haml
app/views/projects/jobs/show.html.haml
+2
-0
ee/app/assets/javascripts/pages/projects/jobs/show/index.js
ee/app/assets/javascripts/pages/projects/jobs/show/index.js
+4
-0
ee/app/views/projects/jobs/_shared_runner_limit_warning.html.haml
...iews/projects/jobs/_shared_runner_limit_warning.html.haml
+0
-13
ee/changelogs/unreleased/225229-update-ci-cd-individual-jobs-page-with-updated-pipelines-minute.yml
...cd-individual-jobs-page-with-updated-pipelines-minute.yml
+5
-0
ee/spec/features/ci_shared_runner_warnings_spec.rb
ee/spec/features/ci_shared_runner_warnings_spec.rb
+21
-1
No files found.
.haml-lint_todo.yml
View file @
ab0ec603
...
...
@@ -358,7 +358,6 @@ linters:
-
"
ee/app/views/notify/unapproved_merge_request_email.html.haml"
-
"
ee/app/views/oauth/geo_auth/error.html.haml"
-
"
ee/app/views/projects/commits/_mirror_status.html.haml"
-
"
ee/app/views/projects/jobs/_shared_runner_limit_warning.html.haml"
-
"
ee/app/views/projects/merge_requests/_approvals_count.html.haml"
-
"
ee/app/views/projects/merge_requests/widget/open/_geo.html.haml"
-
"
ee/app/views/projects/mirrors/_mirrored_repositories_count.html.haml"
...
...
app/views/projects/jobs/show.html.haml
View file @
ab0ec603
...
...
@@ -5,4 +5,6 @@
-
content_for
:page_specific_javascripts
do
=
stylesheet_link_tag
'page_bundles/xterm'
=
render_if_exists
"shared/shared_runners_minutes_limit_flash_message"
#js-job-vue-app
{
data:
jobs_data
}
ee/app/assets/javascripts/pages/projects/jobs/show/index.js
0 → 100644
View file @
ab0ec603
import
'
~/pages/projects/jobs/show/index
'
;
import
initVueAlerts
from
'
~/vue_alerts
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
initVueAlerts
);
ee/app/views/projects/jobs/_shared_runner_limit_warning.html.haml
deleted
100644 → 0
View file @
e22534e9
-
if
project
.
shared_runners_limit_namespace
.
shared_runners_minutes_used?
-
quota_used
=
project
.
shared_runners_limit_namespace
.
shared_runners_minutes
-
quota_limit
=
project
.
shared_runners_limit_namespace
.
actual_shared_runners_minutes_limit
.bs-callout.bs-callout-warning
%p
You have used all your shared Runners pipeline minutes.
=
"(
#{
quota_used
}
of
#{
quota_limit
}
)."
-
if
can?
(
current_user
,
:admin_build
,
@project
)
%br
For more information, go to the
=
succeed
"."
do
=
link_to
project_runners_path
(
project
)
do
Runners page
ee/changelogs/unreleased/225229-update-ci-cd-individual-jobs-page-with-updated-pipelines-minute.yml
0 → 100644
View file @
ab0ec603
---
title
:
Add running out of minutes warning to CI job pages
merge_request
:
35622
author
:
type
:
added
ee/spec/features/ci_shared_runner_warnings_spec.rb
View file @
ab0ec603
...
...
@@ -6,8 +6,10 @@ RSpec.describe 'CI shared runner limits' do
using
RSpec
::
Parameterized
::
TableSyntax
let_it_be
(
:user
)
{
create
(
:user
)
}
let
!
(
:project
)
{
create
(
:project
,
:repository
,
namespace:
group
,
shared_runners_enabled:
true
)
}
let
(
:project
)
{
create
(
:project
,
:repository
,
namespace:
group
,
shared_runners_enabled:
true
)
}
let
(
:group
)
{
create
(
:group
)
}
let
(
:pipeline
)
{
create
(
:ci_empty_pipeline
,
project:
project
,
sha:
project
.
commit
.
sha
,
ref:
'master'
)
}
let!
(
:job
)
{
create
(
:ci_build
,
pipeline:
pipeline
)
}
before
do
sign_in
(
user
)
...
...
@@ -46,6 +48,12 @@ RSpec.describe 'CI shared runner limits' do
expect_quota_exceeded_alert
(
message
)
end
it
'displays a warning message on a job page'
do
visit
project_job_path
(
project
,
job
)
expect_quota_exceeded_alert
(
message
)
end
end
end
...
...
@@ -67,6 +75,12 @@ RSpec.describe 'CI shared runner limits' do
expect_quota_exceeded_alert
(
message
)
end
it
'displays a warning message on a job page'
do
visit
project_job_path
(
project
,
job
)
expect_quota_exceeded_alert
(
message
)
end
end
context
'when limit not yet exceeded'
do
...
...
@@ -83,6 +97,12 @@ RSpec.describe 'CI shared runner limits' do
expect_no_quota_exceeded_alert
end
it
'displays a warning message on a job page'
do
visit
project_job_path
(
project
,
job
)
expect_no_quota_exceeded_alert
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment