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
6229f0e7
Commit
6229f0e7
authored
4 years ago
by
Nathan Hertz
Browse files
Options
Downloads
Patches
Plain Diff
Corrected -1 exit code message; added default exit code message
parent
f3d58e9e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
apps/cli/executables/vulture/src/vulture/condorlite.py
+11
-6
11 additions, 6 deletions
apps/cli/executables/vulture/src/vulture/condorlite.py
apps/cli/executables/vulture/test/null_fail.condor
+4
-0
4 additions, 0 deletions
apps/cli/executables/vulture/test/null_fail.condor
with
15 additions
and
6 deletions
apps/cli/executables/vulture/src/vulture/condorlite.py
+
11
−
6
View file @
6229f0e7
...
...
@@ -34,7 +34,9 @@ class MockLogger:
else
:
event_body
=
"
\t
"
+
event_body
footer
=
"
...
"
self
.
logger
.
info
(
msg
=
"
\n
"
.
join
([
header
,
event_body
,
footer
]))
if
event_body
else
self
.
logger
.
info
(
"
\n
"
.
join
([
header
,
footer
]))
self
.
logger
.
info
(
msg
=
"
\n
"
.
join
([
header
,
event_body
,
footer
])
)
if
event_body
else
self
.
logger
.
info
(
"
\n
"
.
join
([
header
,
footer
]))
@staticmethod
def
create_header
(
event_type
:
WorkflowEventType
)
->
str
:
...
...
@@ -69,8 +71,10 @@ class Job:
self
.
fields
,
self
.
command
=
self
.
parse
(
file
)
self
.
write_log
=
write_log
if
self
.
write_log
:
self
.
logger
=
MockLogger
(
self
.
fields
.
get
(
'
log
'
,
"
./condor.log
"
))
self
.
logger
.
log_event
(
WorkflowEventType
.
SUBMITTED
,
f
"
Job node:
{
self
.
fields
[
'
executable
'
]
}
"
)
self
.
logger
=
MockLogger
(
self
.
fields
.
get
(
"
log
"
,
"
./condor.log
"
))
self
.
logger
.
log_event
(
WorkflowEventType
.
SUBMITTED
,
f
"
Job node:
{
self
.
fields
[
'
executable
'
]
}
"
)
def
parse
(
self
,
file
:
Path
)
->
NamedTuple
:
"""
...
...
@@ -106,12 +110,13 @@ class Job:
def
execute
(
self
):
result_strings
=
{
0
:
"
Normal termination (return value 0)
"
,
-
1
:
"
Error in execution (return value -1)
"
,
# This is 255 instead of -1 because that's what subprocess returns instead of -1
255
:
"
Error in execution (return value -1)
"
,
}
if
self
.
write_log
:
self
.
logger
.
log_event
(
WorkflowEventType
.
EXECUTING
)
retval
=
subprocess
.
call
([
self
.
fields
[
"
executable
"
],
self
.
fields
[
"
arguments
"
]])
exec_results
=
f
"
{
result_strings
[
retval
]
}
"
process
=
subprocess
.
run
([
self
.
fields
[
"
executable
"
],
self
.
fields
[
"
arguments
"
]])
exec_results
=
f
"
{
result_strings
.
get
(
process
.
returncode
,
f
'
Something weird happened (return value
{
process
.
returncode
}
)
'
)
}
"
if
self
.
write_log
:
self
.
logger
.
log_event
(
WorkflowEventType
.
TERMINATED
,
exec_results
)
...
...
This diff is collapsed.
Click to expand it.
apps/cli/executables/vulture/test/null_fail.condor
0 → 100644
+
4
−
0
View file @
6229f0e7
executable = null
arguments = -g
queue
\ No newline at end of file
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