Skip to content
Closed
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
2 changes: 1 addition & 1 deletion JenkinsJobs/Builds/build.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ spec:

def readBuildProperties(String buildPropertiesFile){
return readProperties(file: buildPropertiesFile, charset: 'UTF-8').collectEntries{n, v ->
v = v.trim();
v = v.strip();
return [n, (v.startsWith('"') && v.endsWith('"') ? v.substring(1, v.length() - 1) : v)]
}
}
4 changes: 2 additions & 2 deletions JenkinsJobs/Releng/publishToMaven.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ def installLatestEclipse(){
def props = null
dir("${WORKSPACE}/git-repo") {
props = readProperties(file: 'cje-production/buildproperties.txt').collectEntries{n, v ->
v = v.trim();
v = v.strip();
return [n, (v.startsWith('"') && v.endsWith('"') ? v.substring(1, v.length() - 1) : v)]
}
}
Expand All @@ -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).trim()
return "${pwd()}/" + sh(script: 'ls', returnStdout: true).strip()
}
}
2 changes: 1 addition & 1 deletion JenkinsJobs/SmokeTests/StartSmokeTests.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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).trim()
return "${pwd()}/" + sh(script: 'ls', returnStdout: true).strip()
}
}
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ pipeline {
latestCommitID=$(curl https://download.eclipse.org/eclipse/relengScripts/state)
git diff --name-only ${latestCommitID} HEAD \\
production/ scripts/ cje-production/ eclipse.platform.releng.tychoeclipsebuilder/
''', returnStdout: true).trim().isEmpty()
''', returnStdout: true).strip().isEmpty()
}
}
}
Expand Down
Loading