File tree Expand file tree Collapse file tree 2 files changed +2
-2
lines changed
main/nextflow/cloud/google/batch
test/nextflow/cloud/google/batch Expand file tree Collapse file tree 2 files changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -204,7 +204,7 @@ class GoogleBatchScriptLauncher extends BashWrapperBuilder implements GoogleBatc
204
204
}
205
205
206
206
static String launchCommand ( String workDir ) {
207
- " trap \" { cp ${ TaskRun.CMD_LOG} ${ workDir} /${ TaskRun.CMD_LOG} ; }\" ERR ; /bin/bash ${ workDir} /${ TaskRun.CMD_RUN} 2>&1 | tee ${ TaskRun.CMD_LOG} "
207
+ " trap \" { cp ${ TaskRun.CMD_LOG} ${ workDir} /${ TaskRun.CMD_LOG} ; }\" EXIT ; /bin/bash ${ workDir} /${ TaskRun.CMD_RUN} 2>&1 | tee ${ TaskRun.CMD_LOG} "
208
208
}
209
209
210
210
static String containerMountPath (CloudStoragePath path ) {
Original file line number Diff line number Diff line change @@ -126,7 +126,7 @@ class GoogleBatchExecutorTest extends Specification {
126
126
127
127
where :
128
128
FUSION | DEFAULT_FS | TASK_DIR | EXPECTED
129
- false | false | ' gs://foo/work/dir' | ' /bin/bash -o pipefail -c \' trap "{ cp .command.log gs://foo/work/dir/.command.log; }" ERR ; /bin/bash gs://foo/work/dir/.command.run 2>&1 | tee .command.log\' '
129
+ false | false | ' gs://foo/work/dir' | ' /bin/bash -o pipefail -c \' trap "{ cp .command.log gs://foo/work/dir/.command.log; }" EXIT ; /bin/bash gs://foo/work/dir/.command.run 2>&1 | tee .command.log\' '
130
130
true | false | ' /fusion/work/dir' | ' bash /fusion/work/dir/.command.run'
131
131
false | true | ' /nfs/work/dir' | ' bash /nfs/work/dir/.command.run 2>&1 > /nfs/work/dir/.command.log'
132
132
}
You can’t perform that action at this time.
0 commit comments