Update flux job id regular expression (#5662) [ci fast]

Signed-off-by: vsoch <[email protected]> Co-authored-by: vsoch <[email protected]>
nextflow-io · Jan 11, 2025 · 58a0b34 · 58a0b34
1 parent 9386082
commit 58a0b34
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/modules/nextflow/src/main/groovy/nextflow/executor/FluxExecutor.groovy b/modules/nextflow/src/main/groovy/nextflow/executor/FluxExecutor.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022, Seqera Labs
+ * Copyright 2022-2025, Seqera Labs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ import nextflow.processor.TaskRun
 @CompileStatic
 class FluxExecutor extends AbstractGridExecutor {
 
-    static final private Pattern SUBMIT_REGEX = ~/(ƒ.+)/
+    static final private Pattern SUBMIT_REGEX = ~/((ƒ|f).+)/
 
     /**
      * Gets the directives to submit the specified task to the cluster for execution

diff --git a/modules/nextflow/src/test/groovy/nextflow/executor/FluxExecutorTest.groovy b/modules/nextflow/src/test/groovy/nextflow/executor/FluxExecutorTest.groovy
@@ -38,6 +38,15 @@ class FluxExecutorTest extends Specification {
         exec.parseJobId('ƒ6nmtLVpBq') == 'ƒ6nmtLVpBq'
     }
 
+    def testParseJobID() {
+
+        given:
+        def exec = [:] as FluxExecutor
+
+        expect:
+        exec.parseJobId('f6nmtLVpBq') == 'f6nmtLVpBq'
+    }
+
     def testKill() {
 
         given: