Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
workspaces
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ssa
workspaces
Commits
b0e44622
Commit
b0e44622
authored
9 months ago
by
Charlotte Hausman
Committed by
Sam Kagan
8 months ago
Browse files
Options
Downloads
Patches
Plain Diff
let's not run disabled capabilities...
parent
6107e0d3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
shared/workspaces/workspaces/capability/services/capability_info.py
+6
-4
6 additions, 4 deletions
...kspaces/workspaces/capability/services/capability_info.py
with
6 additions
and
4 deletions
shared/workspaces/workspaces/capability/services/capability_info.py
+
6
−
4
View file @
b0e44622
...
...
@@ -734,7 +734,7 @@ class CapabilityInfo:
COALESCE((SELECT in_state FROM queue_states WHERE c.capability_name = queue_states.capability_name AND queue_state =
'
Queued
'
), 0) AS waiting,
COALESCE((SELECT in_state FROM queue_states WHERE c.capability_name = queue_states.capability_name AND queue_state =
'
Running
'
), 0) AS running,
max_jobs
FROM capabilities c WHERE NOT c.paused
"""
FROM capabilities c WHERE NOT c.paused
AND c.enabled
"""
)
):
result
.
append
(
QueueReport
(
row
[
0
],
row
[
1
],
row
[
2
],
row
[
3
]))
...
...
@@ -786,9 +786,11 @@ class RestrictedInfo(CapabilityInfo):
# Store the previous execution's spool directory for reusing bits of it
# Note: This is currently limited to capabilities that update the fetch stage
if
(
request
.
current_version
.
workflow_metadata
and
"
processing_dir
"
in
request
.
current_version
.
workflow_metadata
and
"
fetch_end_time
"
in
request
.
current_version
.
workflow_metadata
):
if
(
request
.
current_version
.
workflow_metadata
and
"
processing_dir
"
in
request
.
current_version
.
workflow_metadata
and
"
fetch_end_time
"
in
request
.
current_version
.
workflow_metadata
):
parameters
[
"
prev_processing_dir
"
]
=
request
.
current_version
.
workflow_metadata
[
"
processing_dir
"
]
version
=
CapabilityVersion
(
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment