Skip to content

Commit

Permalink
Revert "[CI] filter static versus ephemeral workers (elastic#22607)"
Browse files Browse the repository at this point in the history
This reverts commit 5e21666.
  • Loading branch information
v1v committed Nov 17, 2020
1 parent 5e21666 commit 3579905
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -683,18 +683,11 @@ def notifyBuildReason() {

/**
* Guarantee a specific worker can only be used for a specific build. This was not the case
* with the customise node provisioner that reuses workers in some cases when there is a peak load.
* with the customise node provisioner that reuses workers when there is peak load.
*/
def withNode(def label, Closure body) {
def labels
// There are immutable workers and static ones, so the static ones are only metal, macosx and arm
if (label.contains('arm') || label.contains('macosx') || label.contains('metal')) {
labels = label
} else {
// Otherwise use the dynamic UUID for the gobld
def uuid = UUID.randomUUID().toString()
labels = label?.trim() ? "${label} && extra/${uuid}" : "extra/${uuid}"
}
def uuid = UUID.randomUUID().toString()
def labels = label?.trim() ? "${label} && extra/${uuid}" : "extra/${uuid}"
node("${labels}") {
body()
}
Expand Down

0 comments on commit 3579905

Please sign in to comment.