Skip to content

Commit

Permalink
remove trailing spaces from files (#4574)
Browse files Browse the repository at this point in the history
* remove trailing spaces from files

* Update .project
  • Loading branch information
Ndacyayisenga-droid authored Jul 2, 2023
1 parent 7f319a8 commit 436302e
Show file tree
Hide file tree
Showing 18 changed files with 188 additions and 188 deletions.
22 changes: 11 additions & 11 deletions buildenv/jenkins/JenkinsfileBase
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ def setupParallelEnv() {
echo 'Exception: ' + e.toString()
echo 'Cannot run copyArtifacts from test.getDependency. Skipping copyArtifacts...'
}

String unsetLLP = ""
//unset LD_LIBRARY_PATH workaround for issue https://github.com/adoptium/infrastructure/issues/2934
if (JDK_IMPL == 'hotspot' && JDK_VERSION == '8' && PLATFORM.contains('alpine-linux')) {
Expand Down Expand Up @@ -387,9 +387,9 @@ def setup() {
if (!env.SPEC.startsWith('aix') && !env.SPEC.startsWith('zos')) {
riURL = "${artifactoryUrl}/${repoForRi}/Latest/${PLATFORM}/${JDK_VERSION}"
}
}
}
CUSTOMIZED_SDK_URL_OPTION = "-c '${params.CUSTOMIZED_SDK_URL} ${riURL}'"
}
}
} else {
CUSTOMIZED_SDK_URL_OPTION = ""
}
Expand Down Expand Up @@ -677,7 +677,7 @@ def runTest( ) {
sh "/usr/bin/X11/X -force -vfb -x abx -x dbe -x GLX -secIP 000 :0 &"
env.DISPLAY = "unix:0"
echo "env.DISPLAY is ${env.DISPLAY}"

} else if (env.SPEC.startsWith('sunos')) {
sh "/usr/X11/bin/Xvfb :2 -screen 0 1024x768x24 &"
env.DISPLAY = ":2"
Expand Down Expand Up @@ -745,7 +745,7 @@ def checkTestResults(results) {
summary.appendText("NO TEST FOUND!", false)
return
}

if (results["FAILED"] != 0) {
currentBuild.result = 'UNSTABLE'
echo 'There were test failures, set build result to UNSTABLE.'
Expand Down Expand Up @@ -932,7 +932,7 @@ def terminateTestProcesses() {
def statusCode=sh(script:"aqa-tests/terminateTestProcesses.sh ${env.USER} 2>&1", returnStatus:true)
if (statusCode != 0) {
echo "rc = ${statusCode}, Unable to terminate all processes."
}
}
}

def getJDKImpl(jvm_version) {
Expand Down Expand Up @@ -987,7 +987,7 @@ def archiveFile(filename, forceStoreOnJenkins) {
if (!params.ARTIFACTORY_SERVER || forceStoreOnJenkins) {
echo "Saving ${filename} file on jenkins."
archiveArtifacts artifacts: filename, fingerprint: true, allowEmptyArchive: true
}
}
if (params.ARTIFACTORY_SERVER) {
def pattern = "${env.WORKSPACE}/${filename}"
uploadToArtifactory(pattern)
Expand All @@ -998,12 +998,12 @@ def uploadToArtifactory(pattern, artifactoryUploadDir="") {
if (params.ARTIFACTORY_SERVER) {
def server = Artifactory.server params.ARTIFACTORY_SERVER
def artifactoryRepo = params.ARTIFACTORY_REPO ? params.ARTIFACTORY_REPO : "sys-rt-generic-local"

if (artifactoryRepo.contains(',')) {
String[] repos = artifactoryRepo.split(",")
artifactoryRepo = repos[0].trim()
}

def artifactoryRoorDir = params.ARTIFACTORY_ROOT_DIR ? params.ARTIFACTORY_ROOT_DIR : getJenkinsDomain()
if (artifactoryRoorDir.endsWith("/")) {
artifactoryRoorDir = artifactoryRoorDir.substring(0, artifactoryRoorDir.length() - 1);
Expand Down Expand Up @@ -1164,11 +1164,11 @@ def addFailedTestsGrinderLink(paths=""){
def customizedTestCases = [:]
if (jdkFailedTestCaseList) {
customizedTestCases['jdk'] = "${jdkFailedTestCaseList}"
}
}
if (hotspotFailedTestCaseList) {
customizedTestCases['hotspot'] = "${hotspotFailedTestCaseList}"
}
customizedTestCases.each { target, testcases ->
customizedTestCases.each { target, testcases ->
def tempTestCases = testcases.substring(0, testcases.length() - 1)
tempTestCases = tempTestCases.split(' ').toUnique().join('+')
def customURL = url.replace(env.FAILED_TEST_TARGET, "TARGET=${target}_custom")
Expand Down
2 changes: 1 addition & 1 deletion buildenv/jenkins/aqaTestPipeline.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ JDK_VERSIONS.each { JDK_VERSION ->

if (SDK_RESOURCE == "customized" ) {
if (params.TOP_LEVEL_SDK_URL) {
// example: <jenkins_url>/job/build-scripts/job/openjdk11-pipeline/123/artifact/target/linux/aarch64/openj9/*_aarch64_linux_*.tar.gz/*zip*/openj9.zip
// example: <jenkins_url>/job/build-scripts/job/openjdk11-pipeline/123/artifact/target/linux/aarch64/openj9/*_aarch64_linux_*.tar.gz/*zip*/openj9.zip
download_url = params.TOP_LEVEL_SDK_URL + "artifact/target/${os}/${arch}/${params.VARIANT}/${filter}/*zip*/${params.VARIANT}.zip"
}
} else if (SDK_RESOURCE == "releases") {
Expand Down
20 changes: 10 additions & 10 deletions buildenv/jenkins/openjdk_tests
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ timestamps{
// trigger xxx_imageUpload test job, then xxx_imagePull test job
def commonLabel = "sw.tool.podman&&sw.tool.container.criu"
if (params.LABEL_ADDITION) {
commonLabel += "&&${params.LABEL_ADDITION}"
commonLabel += "&&${params.LABEL_ADDITION}"
}
def imageUploadMap = [
'x86-64_linux' : [
Expand Down Expand Up @@ -315,7 +315,7 @@ timestamps{
} else {
// IF no nodes are idle we will check if there is supported virtual agent
// When Parallel the race condition could happen. Say the number of multiply jobs is larger than the available nodes the query's result may be delayed and wrong
// In this case jobs will be fooled to fall back to wait local busy nodes.
// In this case jobs will be fooled to fall back to wait local busy nodes.
dynamicAgents = PLATFORM_MAP[params.PLATFORM]["DynamicAgents"] ? PLATFORM_MAP[params.PLATFORM]["DynamicAgents"] : []
println "dynamicAgents: ${dynamicAgents}"

Expand Down Expand Up @@ -371,7 +371,7 @@ timestamps{
echo "Done with main node"
}
echo "Done with RELATED_NODES: ${params.RELATED_NODES}"
}
}
}
} else {
assert false : "Cannot find RELATED_NODES: ${params.RELATED_NODES}."
Expand All @@ -396,7 +396,7 @@ def runTest() {
try {
def retry_count = 0
def sleep_time = 180

if (params.PLATFORM.contains('zos')) {
/* Ensure correct CC env */
env._CC_CCMODE = '1'
Expand Down Expand Up @@ -448,7 +448,7 @@ def runTest() {
jenkinsfile = load "${WORKSPACE}/aqa-tests/buildenv/jenkins/JenkinsfileBase"
if (LABEL.contains('ci.agent.dynamic') && CLOUD_PROVIDER.equals('azure')) {
//Set dockerimage for azure agent. Fyre has stencil to setup the right environment
docker.image('adoptopenjdk/centos6_build_image').pull()
docker.image('adoptopenjdk/centos6_build_image').pull()
docker.image('adoptopenjdk/centos6_build_image').inside {
jenkinsfile.testBuild()
}
Expand Down Expand Up @@ -526,7 +526,7 @@ def areNodesWithLabelOnline(labelToCheck) {
String[] onlineNodes = nodesByLabel(labelToCheck)
if (onlineNodes.size() < 1) {
return false
}
}
return true
}

Expand All @@ -547,7 +547,7 @@ def checkErrors(errorList) {
println("${message}")
currentNode.setTemporarilyOffline(true, new hudson.slaves.OfflineCause.UserCause(User.current(), "${message}"))
}
// if SLACK_CHANNEL is provided, send the message in slack
// if SLACK_CHANNEL is provided, send the message in slack
if (params.SLACK_CHANNEL) {
slackSend channel: SLACK_CHANNEL, message: "${message}"
}
Expand All @@ -574,7 +574,7 @@ def changeParam(paramsList, newParams) {
paramsList.each { param ->
def value = param.value.toString()
newParams.each { newParam ->

if (param.key == newParam.key) {
value = newParam.value.toString()
}
Expand Down Expand Up @@ -617,11 +617,11 @@ def generateJobViaAutoGen(testJobName) {
jobParams << string(name: 'GROUPS', value: group)
}
}
}
}
}
jobParams << string(name: 'JDK_IMPL', value: jdk_impl)
jobParams << string(name: 'JDK_VERSIONS', value: jdk_version)

build job: 'Test_Job_Auto_Gen', parameters: jobParams, propagate: true
}
}
}
2 changes: 1 addition & 1 deletion buildenv/jenkins/testJobTemplate
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ ARCH_OS_LIST.each { ARCH_OS ->
When DYNAMIC_COMPILE is on: <br/>
- if there is no BUILD_LIST input, DYNAMIC_COMPILE will automatically figure out which test material to compile based on the test target.<br/>
- if there is BUILD_LIST input, the BUILD_LIST will be further refined based on the test target.''')
stringParam('TARGET', "${ACTUAL_TARGET}",
stringParam('TARGET', "${ACTUAL_TARGET}",
'''Test TARGET to execute, you can also select sub-targets such as:<br/>
different level: sanity|extended|special<br/>
different group: openjdk|system|jck|functional|perf|external<br/>
Expand Down
4 changes: 2 additions & 2 deletions buildenv/jenkins/triggerGrinder.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ def launch_grinders(List<Map<String, Object>> json) {
/**
Get the parameters specified as a string list.
Get each of the key-value pairs for each json value.
If the issue for a job is closed, and JDK_VERSION and
JDK_IMPL match the parameters specified,
If the issue for a job is closed, and JDK_VERSION and
JDK_IMPL match the parameters specified,
run grinder on it. Otherwise ignore it
*/

Expand Down
Loading

0 comments on commit 436302e

Please sign in to comment.