Skip to content

Commit

Permalink
[Build] Use general 'native.builder' agent labels
Browse files Browse the repository at this point in the history
  • Loading branch information
HannesWell authored and akurtakov committed Jul 12, 2024
1 parent 826393d commit 4194529
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* Hannes Wellmann - Streamline entire SWT build and replace ANT-scripts by Maven, Jenkins-Pipeline and single-source Java scripts
*******************************************************************************/

def nativeBuildAgent(String platform, Closure body) {
def runOnNativeBuildAgent(String platform, Closure body) {
def final nativeBuildStageName = 'Build SWT-native binaries'
if (platform == 'gtk.linux.x86_64') {
return podTemplate(yaml: '''
Expand Down Expand Up @@ -45,7 +45,7 @@ spec:
claimName: tools-claim-jiro-releng
''') { node(POD_LABEL) { stage(nativeBuildStageName) { container('swtbuild') { body() } } } }
} else {
return node('swt.natives-' + platform) { stage(nativeBuildStageName) { body() } }
return node('native.builder-' + platform) { stage(nativeBuildStageName) { body() } }
}
}

Expand Down Expand Up @@ -214,7 +214,7 @@ pipeline {
stash name:"jdk.resources.${os}.${arch}", includes: "include/,lib/"
deleteDir()
}
nativeBuildAgent("${PLATFORM}") {
runOnNativeBuildAgent("${PLATFORM}") {
cleanWs() // Workspace is not cleaned up by default, so we do it explicitly
echo "OS: ${os}, ARCH: ${arch}"
unstash "swt.binaries.sources.${ws}"
Expand Down

0 comments on commit 4194529

Please sign in to comment.