From 4dabc58884c20d2687b6f836f86c82109e648934 Mon Sep 17 00:00:00 2001 From: Ed Merks Date: Thu, 1 May 2025 09:39:45 +0200 Subject: [PATCH] Use trim() instead of strip() because Jenkins doesn't like it now. --- JenkinsJobs/Releng/publishToMaven.jenkinsfile | 2 +- JenkinsJobs/SmokeTests/StartSmokeTests.jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/JenkinsJobs/Releng/publishToMaven.jenkinsfile b/JenkinsJobs/Releng/publishToMaven.jenkinsfile index 74c7e795d1c..1e353e441b1 100644 --- a/JenkinsJobs/Releng/publishToMaven.jenkinsfile +++ b/JenkinsJobs/Releng/publishToMaven.jenkinsfile @@ -276,6 +276,6 @@ def installLatestEclipse(){ def install(String toolType, String url) { dir("${WORKSPACE}/tools/${toolType}") { sh "curl -L ${url} | tar -xzf -" - return "${pwd()}/" + sh(script: 'ls', returnStdout: true).strip() + return "${pwd()}/" + sh(script: 'ls', returnStdout: true).trim() } } diff --git a/JenkinsJobs/SmokeTests/StartSmokeTests.jenkinsfile b/JenkinsJobs/SmokeTests/StartSmokeTests.jenkinsfile index 4926e03f7c7..e080d3316b0 100644 --- a/JenkinsJobs/SmokeTests/StartSmokeTests.jenkinsfile +++ b/JenkinsJobs/SmokeTests/StartSmokeTests.jenkinsfile @@ -158,6 +158,6 @@ def installJDK(String version, String os, String arch, String releaseType='ga') } dir ("${WORKSPACE}/java") { sh "curl -L https://api.adoptium.net/v3/binary/latest/${version}/${releaseType}/${os}/${arch}/jdk/hotspot/normal/eclipse | tar -xzf -" - return "${pwd()}/" + sh(script: 'ls', returnStdout: true).strip() + return "${pwd()}/" + sh(script: 'ls', returnStdout: true).trim() } }