projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '17702-wb1-bypass-fed' refs #17702
[arvados.git]
/
apps
/
workbench
/
app
/
controllers
/
container_requests_controller.rb
diff --git
a/apps/workbench/app/controllers/container_requests_controller.rb
b/apps/workbench/app/controllers/container_requests_controller.rb
index c217eb977a2350def6c5a6ab9550d89d6b79b37a..be463b022cc6ed013ab652fba16140daf4e2d08d 100644
(file)
--- a/
apps/workbench/app/controllers/container_requests_controller.rb
+++ b/
apps/workbench/app/controllers/container_requests_controller.rb
@@
-127,14
+127,12
@@
class ContainerRequestsController < ApplicationController
@updates[:reuse_steps] = false
end
@updates[:command] ||= @object.command
@updates[:reuse_steps] = false
end
@updates[:command] ||= @object.command
+ @updates[:command] -= ["--disable-reuse", "--enable-reuse"]
if @updates[:reuse_steps]
if @updates[:reuse_steps]
- @updates[:command] = @updates[:command] - ["--disable-reuse"]
- @updates[:command].insert(1, '--enable-reuse')
+ @updates[:command].insert(1, "--enable-reuse")
else
else
- @updates[:command] -= @updates[:command] - ["--enable-reuse"]
- @updates[:command].insert(1, '--disable-reuse')
+ @updates[:command].insert(1, "--disable-reuse")
end
end
-
@updates.delete(:reuse_steps)
end
@updates.delete(:reuse_steps)
end
@@
-167,26
+165,31
@@
class ContainerRequestsController < ApplicationController
if arg.start_with? "--project-uuid="
command[i] = "--project-uuid=#{@object.owner_uuid}"
end
if arg.start_with? "--project-uuid="
command[i] = "--project-uuid=#{@object.owner_uuid}"
end
- if arg == "--disable-reuse"
- command[i] = "--enable-reuse"
- end
end
end
+ command -= ["--disable-reuse", "--enable-reuse"]
+ command.insert(1, '--enable-reuse')
+ end
+
+ if params[:use_existing] == "false"
+ params[:use_existing] = false
+ elsif params[:use_existing] == "true"
+ params[:use_existing] = true
end
end
- # By default the copied CR won't be reusing containers, unless use_existing=true
-
# param is passed
.
-
if
params[:use_existing]
- @object.use_existing = true
+ if params[:use_existing] || params[:use_existing].nil?
+
# If nil, reuse workflow steps but not the workflow runner
.
+
@object.use_existing = !!
params[:use_existing]
+
# Pass the correct argument to arvados-cwl-runner command.
if command[0] == 'arvados-cwl-runner'
# Pass the correct argument to arvados-cwl-runner command.
if command[0] == 'arvados-cwl-runner'
- command
= src.command - ['--disable-reuse'
]
+ command
-= ["--disable-reuse", "--enable-reuse"
]
command.insert(1, '--enable-reuse')
end
else
@object.use_existing = false
# Pass the correct argument to arvados-cwl-runner command.
command.insert(1, '--enable-reuse')
end
else
@object.use_existing = false
# Pass the correct argument to arvados-cwl-runner command.
- if
src.
command[0] == 'arvados-cwl-runner'
- command
= src.command - ['--enable-reuse'
]
+ if command[0] == 'arvados-cwl-runner'
+ command
-= ["--disable-reuse", "--enable-reuse"
]
command.insert(1, '--disable-reuse')
end
end
command.insert(1, '--disable-reuse')
end
end