Skip to content

Commit

Permalink
Add battable comments and remove cyclonedx-lib at appropriate time
Browse files Browse the repository at this point in the history 
Signed-off-by: Stewart X Addison <[email protected]>
  • Loading branch information
@sxa
sxa committed Sep 2, 2024
1 parent d33d46f commit 7f6aa9c
Showing 1 changed file with 21 additions and 3 deletions.
24 changes: 21 additions & 3 deletions pipelines/build/common/openjdk_build_pipeline.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1485,7 +1485,8 @@ class Build {
context.println 'Checked out repo:'
context.sh(script: 'git status')
context.println 'Checked out HEAD commit SHA:'
context.sh(script: 'git rev-parse HEAD')
// windbld#245
context.bat(script: 'git rev-parse HEAD')
}

/*
Expand Down Expand Up @@ -1536,6 +1537,7 @@ class Build {
// Issue: https://issues.jenkins.io/browse/JENKINS-64779
if (context.WORKSPACE != null && !context.WORKSPACE.isEmpty()) {
context.println 'Cleaning workspace non-hidden files: ' + context.WORKSPACE + '/*'
context.println 'SXA: batable 1540'
context.sh(script: 'rm -rf ' + context.WORKSPACE + '/*')
} else {
context.println 'Warning: Unable to clean workspace as context.WORKSPACE is null/empty'
Expand Down Expand Up @@ -1563,7 +1565,8 @@ class Build {
context.timeout(time: buildTimeouts.NODE_CLEAN_TIMEOUT, unit: 'HOURS') {
if (context.WORKSPACE != null && !context.WORKSPACE.isEmpty()) {
context.println 'Removing workspace openjdk build directory: ' + openjdk_build_dir
context.sh(script: 'rm -rf ' + openjdk_build_dir)
context.println 'SXA: batable and batted 1568 windbld#261,262'
context.bat(script: 'rm -rf ' + openjdk_build_dir)
} else {
context.println 'Warning: Unable to remove workspace openjdk build directory as context.WORKSPACE is null/empty'
}
Expand All @@ -1587,8 +1590,10 @@ class Build {
// Perform a git clean outside of checkout to avoid the Jenkins enforced 10 minute timeout
// https://github.com/adoptium/infrastucture/issues/1553
if ( buildConfig.TARGET_OS == 'windows' && buildConfig.DOCKER_IMAGE ) {
context.println 'SXA: batable 1593'
context.sh(script: 'git config --global safe.directory $(cygpath ' + '\$' + '{WORKSPACE})')
}
context.println 'SXA: batable 1596'
context.sh(script: 'git clean -fdx')

printGitRepoInfo()
Expand Down Expand Up @@ -1634,11 +1639,13 @@ class Build {
}
context.withEnv(['BUILD_ARGS=' + signBuildArgs]) {
context.println 'Building an exploded image for signing'
context.sh(script: "./${ADOPT_DEFAULTS_JSON['scriptDirectories']['buildfarm']}")
// windbld#254
context.bat(script: "bash ./${ADOPT_DEFAULTS_JSON['scriptDirectories']['buildfarm']}")
}
def base_path = build_path
if (openjdk_build_dir_arg == "") {
// If not using a custom openjdk build dir, then query what autoconf created as the build sub-folder
context.println 'SXA: not batable 1648'
base_path = context.sh(script: "ls -d ${build_path}/* | tr -d '\\n'", returnStdout:true)
}
context.println "base build path for jmod signing = ${base_path}"
Expand All @@ -1650,6 +1657,7 @@ class Build {
"${base_path}/jdk/modules/jdk.jpackage/jdk/jpackage/internal/resources/*"

context.node('eclipse-codesign') {
context.println 'SXA: batable-ish 1660'
context.sh "rm -rf ${base_path}/* || true"

repoHandler.checkoutAdoptBuild(context)
Expand All @@ -1659,6 +1667,7 @@ class Build {
context.unstash 'jmods'
def target_os = "${buildConfig.TARGET_OS}"
context.withEnv(['base_os='+target_os, 'base_path='+base_path]) {
context.println 'SXA: not batable 1670'
// groovylint-disable
context.sh '''
#!/bin/bash
Expand Down Expand Up @@ -1732,6 +1741,7 @@ class Build {
}

// Remove jmod directories to be replaced with the stash saved above
context.println 'SXA: batable 1744'
context.sh "rm -rf ${base_path}/hotspot/variant-server || true"
context.sh "rm -rf ${base_path}/support/modules_cmds || true"
context.sh "rm -rf ${base_path}/support/modules_libs || true"
Expand All @@ -1751,6 +1761,7 @@ class Build {
}
context.withEnv(['BUILD_ARGS=' + assembleBuildArgs]) {
context.println 'Assembling the exploded image'
context.println 'SXA: probably batable 1764'
context.sh(script: "./${ADOPT_DEFAULTS_JSON['scriptDirectories']['buildfarm']}")
}
} else {
Expand All @@ -1761,6 +1772,7 @@ class Build {
buildArgs = openjdk_build_dir_arg
}
context.withEnv(['BUILD_ARGS=' + buildArgs]) {
context.println 'SXA: probably batable 1775'
context.sh(script: "./${ADOPT_DEFAULTS_JSON['scriptDirectories']['buildfarm']}")
}
}
Expand All @@ -1785,6 +1797,7 @@ class Build {
buildArgs = openjdk_build_dir_arg
}
context.withEnv(['BUILD_ARGS=' + buildArgs]) {
context.println 'SXA: probably batable 1775'
context.sh(script: "./${DEFAULTS_JSON['scriptDirectories']['buildfarm']}")
}
context.println '[CHECKOUT] Reverting pre-build user temurin-build checkout...'
Expand Down Expand Up @@ -1842,6 +1855,7 @@ class Build {
if (context.WORKSPACE != null && !context.WORKSPACE.isEmpty()) {
if (cleanWorkspaceAfter) {
context.println 'Cleaning workspace non-hidden files: ' + context.WORKSPACE + '/*'
context.println 'SXA: batable 1858'
context.sh(script: 'rm -rf ' + context.WORKSPACE + '/*')

// Clean remaining hidden files using cleanWs
Expand All @@ -1852,6 +1866,7 @@ class Build {
context.println "Failed to clean ${e}"
}
} else if (cleanWorkspaceBuildOutputAfter) {
context.println 'SXA: batable 1869'
context.println 'Cleaning workspace build output files: ' + openjdk_build_dir
context.sh(script: 'rm -rf ' + openjdk_build_dir)
context.println 'Cleaning workspace build output files: ' + context.WORKSPACE + '/workspace/target'
Expand Down Expand Up @@ -2023,6 +2038,9 @@ class Build {
context.node(label) {
addNodeToBuildDescription()
// Cannot clean workspace from inside docker container

context.println 'SXA: batable and batted 2042 (rm cyclonedx-lib)'
context.bat('rm -rf c:/workspace/openjdk-build/cyclonedx-lib')
if (cleanWorkspace) {
try {
context.timeout(time: buildTimeouts.CONTROLLER_CLEAN_TIMEOUT, unit: 'HOURS') {
Expand Down

0 comments on commit 7f6aa9c

Please sign in to comment.