Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,13 @@ class SeqeraExecutor extends Executor implements ExtensionPoint {
@PackageScope
void computeRunResourceLabels() {
final processMap = session.config.process as Map
this.runResourceLabels = Labels.toStringMap(processMap?.get('resourceLabels'))
final value = processMap?.get('resourceLabels')
if( value instanceof Closure ) {
log.debug "Skipping run-level process.resourceLabels: dynamic (closure) values are only resolved per-task"
this.runResourceLabels = Collections.<String,String>emptyMap()
return
}
this.runResourceLabels = Labels.toStringMap(value)
}

SeqeraBatchSubmitter getBatchSubmitter() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,23 @@ class SeqeraExecutorTest extends Specification {
executor.runResourceLabels == [:]
}

def 'should skip run resource labels when process.resourceLabels is a closure'() {
given:
SysEnv.push([:])
def executor = new SeqeraExecutor()
def dynamic = { [team: 'a', priority: 7] }
executor.session = Mock(Session) {
getConfig() >> [process: [resourceLabels: dynamic]]
}

when:
executor.computeRunResourceLabels()

then:
noExceptionThrown()
executor.runResourceLabels == [:]
}

def 'createRun populates CreateRunRequest.labels with config-level resourceLabels merged with auto-labels'() {
given:
SysEnv.push([:])
Expand Down
Loading