Skip to content

Commit

Permalink
De-duplicate envVars setup
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 26, 2024
1 parent ced2eb6 commit e83f8f3
Showing 1 changed file with 37 additions and 56 deletions.
93 changes: 37 additions & 56 deletions pipelines/build/common/openjdk_build_pipeline.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1631,8 +1631,8 @@ class Build {

def buildScriptsAssemble(
cleanWorkspaceAfter,
filename,
useAdoptShellScripts
useAdoptShellScripts,
buildConfigEnvVars
) {
def build_path
def openjdk_build_dir
Expand All @@ -1659,19 +1659,8 @@ def buildScriptsAssemble(
// Restore signed JMODs
context.unstash 'signed_jmods'
// Convert IndividualBuildConfig to jenkins env variables
List<String> envVars = buildConfig.toEnvVars()
envVars.add("FILENAME=${filename}" as String)
// Use BUILD_REF override if specified
def adoptBranch = buildConfig.BUILD_REF ?: ADOPT_DEFAULTS_JSON['repository']['build_branch']
// Add platform config path so it can be used if the user doesn't have one
def splitAdoptUrl = ((String)ADOPT_DEFAULTS_JSON['repository']['build_url']) - ('.git').split('/')
// e.g. https://github.com/adoptium/temurin-build.git will produce adoptium/temurin-build
String userOrgRepo = "${splitAdoptUrl[splitAdoptUrl.size() - 2]}/${splitAdoptUrl[splitAdoptUrl.size() - 1]}"
// e.g. adoptium/temurin-build/master/build-farm/platform-specific-configurations
envVars.add("ADOPT_PLATFORM_CONFIG_LOCATION=${userOrgRepo}/${adoptBranch}/${ADOPT_DEFAULTS_JSON['configDirectories']['platform']}" as String)
// SXAEC: temporary fudge as the container doesn't have ant in the path
// envVars.add("PATH=c:\\SXAEC;c:\\cygwin64\\bin;c:\\Windows\\System32;c:\\windows;c:\\Windows\\System32\\WindowsPowershell\\v1.0;c:\\Program Files\\Git\\bin;c:\\apache-ant\\apache-ant-1.10.5\\bin" as String)
context.withEnv(envVars) {
context.withEnv(buildConfigEnvVars) {
if (env.BUILD_ARGS != null && !env.BUILD_ARGS.isEmpty()) {
context.println "SXAEC: Adding " + env.BUILD_ARGS + " before starting secondary env context"
assembleBuildArgs = env.BUILD_ARGS + ' --assemble-exploded-image' + openjdk_build_dir_arg
Expand Down Expand Up @@ -1709,7 +1698,7 @@ def buildScriptsAssemble(
throw new Exception("[ERROR] Build JDK timeout (${buildTimeouts.BUILD_JDK_TIMEOUT} HOURS) has been reached. Exiting...")
}
} // context.withEnv(buildargs)
} // context.withEnv(envVars)
} // context.withEnv(buildConfigEnvVars)
String versionOut
if (buildConfig.BUILD_ARGS.contains('--cross-compile')) {
context.println "[WARNING] Don't read faked version.txt on cross compiled build! Archiving early and running downstream job to retrieve java version..."
Expand Down Expand Up @@ -1751,9 +1740,9 @@ def buildScriptsAssemble(
cleanWorkspace,
cleanWorkspaceAfter,
cleanWorkspaceBuildOutputAfter,
filename,
useAdoptShellScripts,
enableSigner
enableSigner,
buildConfigEnvVars
) {
return context.stage('build') {
// Create the repo handler with the user's defaults to ensure a temurin-build checkout is not null
Expand Down Expand Up @@ -1791,7 +1780,6 @@ def buildScriptsAssemble(
// 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'
batOrSh(script: 'rm -rf ' + context.WORKSPACE + '/*')
} else {
context.println 'Warning: Unable to clean workspace as context.WORKSPACE is null/empty'
Expand Down Expand Up @@ -1820,10 +1808,8 @@ def buildScriptsAssemble(
if (context.WORKSPACE != null && !context.WORKSPACE.isEmpty()) {
context.println 'Removing workspace openjdk build directory: ' + openjdk_build_dir
batOrSh('rm -rf ' + openjdk_build_dir)
batOrSh('ls -l ' + context.WORKSPACE + '/workspace/target || true')
context.println 'SXAEC: Clearing output artefacts to avoid duplicates being passed to the installer #680'
// SXAEC: This was to handle using none of the clean options when extracting tarballs ...
batOrSh('rm -rf ' + context.WORKSPACE + '/workspace/target/*')
// SXAEC: This handles when none of the clean options are used when extracting cached tarballs ...
batOrSh('rm -rf ' + context.WORKSPACE + '/workspace/target/*')
} else {
context.println 'Warning: Unable to remove workspace openjdk build directory as context.WORKSPACE is null/empty'
}
Expand Down Expand Up @@ -1859,21 +1845,8 @@ def buildScriptsAssemble(

try {
// Convert IndividualBuildConfig to jenkins env variables
List<String> envVars = buildConfig.toEnvVars()
envVars.add("FILENAME=${filename}" as String)

// Use BUILD_REF override if specified
def adoptBranch = buildConfig.BUILD_REF ?: ADOPT_DEFAULTS_JSON['repository']['build_branch']

// Add platform config path so it can be used if the user doesn't have one
def splitAdoptUrl = ((String)ADOPT_DEFAULTS_JSON['repository']['build_url']) - ('.git').split('/')
// e.g. https://github.com/adoptium/temurin-build.git will produce adoptium/temurin-build
String userOrgRepo = "${splitAdoptUrl[splitAdoptUrl.size() - 2]}/${splitAdoptUrl[splitAdoptUrl.size() - 1]}"
// e.g. adoptium/temurin-build/master/build-farm/platform-specific-configurations
envVars.add("ADOPT_PLATFORM_CONFIG_LOCATION=${userOrgRepo}/${adoptBranch}/${ADOPT_DEFAULTS_JSON['configDirectories']['platform']}" as String)

// Execute build
context.withEnv(envVars) {
context.withEnv(buildConfigEnvVars) {
try {
context.timeout(time: buildTimeouts.BUILD_JDK_TIMEOUT, unit: 'HOURS') {
// Set Github Commit Status
Expand All @@ -1884,7 +1857,6 @@ def buildScriptsAssemble(
context.println '[CHECKOUT] Checking out to adoptium/temurin-build...'
repoHandler.checkoutAdoptBuild(context)
printGitRepoInfo()
// START
if ((buildConfig.TARGET_OS == 'mac' || buildConfig.TARGET_OS == 'windows') && buildConfig.JAVA_TO_BUILD != 'jdk8u' && enableSigner) {
context.println "Generating exploded build" // , sign JMODS, and assemble build, for platform ${buildConfig.TARGET_OS} version ${buildConfig.JAVA_TO_BUILD}"
def signBuildArgs // Build args for make-adopt-build-farm.sh
Expand All @@ -1900,7 +1872,6 @@ def buildScriptsAssemble(
context.println "openjdk_build_pipeline: Calling MABF on win/mac to build exploded image"
// batOrSh("bash ./${ADOPT_DEFAULTS_JSON['scriptDirectories']['buildfarm']}")
// Use cached version from an attempt at the first phase only
batOrSh("ant --version")
context.bat(script: "bash -c 'curl https://ci.adoptium.net/userContent/windows/openjdk-cached-workspace-phase1+8.tar.gz | tar -C /cygdrive/c/workspace/openjdk-build -xzf -'")
}
def base_path = build_path
Expand Down Expand Up @@ -1973,11 +1944,9 @@ def buildScriptsAssemble(
}
throw new Exception("[ERROR] Build JDK timeout (${buildTimeouts.BUILD_JDK_TIMEOUT} HOURS) has been reached. Exiting...")
}
context.println "SXAEC: Likely problem section"
if ((buildConfig.TARGET_OS == 'mac' || buildConfig.TARGET_OS == 'windows') && buildConfig.JAVA_TO_BUILD != 'jdk8u' && enableSigner) {
context.println "Signing phase required - skipping metadata reading"
} else {
context.println "SXAEC: Definite problem section :-)"
// Run a downstream job on riscv machine that returns the java version. Otherwise, just read the version.txt
String versionOut
if (buildConfig.BUILD_ARGS.contains('--cross-compile')) {
Expand Down Expand Up @@ -2171,6 +2140,18 @@ context.println "SXAEC: Definite problem section :-)"
def helperRef = buildConfig.HELPER_REF ?: DEFAULTS_JSON['repository']['helper_ref']
def nonDockerNodeName = ''

// Convert IndividualBuildConfig to jenkins env variables
List<String> envVars = buildConfig.toEnvVars()
envVars.add("FILENAME=${filename}" as String)
// Use BUILD_REF override if specified
def adoptBranch = buildConfig.BUILD_REF ?: ADOPT_DEFAULTS_JSON['repository']['build_branch']
// Add platform config path so it can be used if the user doesn't have one
def splitAdoptUrl = ((String)ADOPT_DEFAULTS_JSON['repository']['build_url']) - ('.git').split('/')
// e.g. https://github.com/adoptium/temurin-build.git will produce adoptium/temurin-build
String userOrgRepo = "${splitAdoptUrl[splitAdoptUrl.size() - 2]}/${splitAdoptUrl[splitAdoptUrl.size() - 1]}"
// e.g. adoptium/temurin-build/master/build-farm/platform-specific-configurations
envVars.add("ADOPT_PLATFORM_CONFIG_LOCATION=${userOrgRepo}/${adoptBranch}/${ADOPT_DEFAULTS_JSON['configDirectories']['platform']}" as String)

context.stage('queue') {
/* This loads the library containing two Helper classes, and causes them to be
imported/updated from their repo. Without the library being imported here, runTests method will fail to execute the post-build test jobs for reasons unknown.*/
Expand Down Expand Up @@ -2285,9 +2266,9 @@ context.println "SXAEC: Definite problem section :-)"
cleanWorkspace,
cleanWorkspaceAfter,
cleanWorkspaceBuildOutputAfter,
filename,
useAdoptShellScripts,
enableSigner
enableSigner,
envVars
)
}
} else {
Expand All @@ -2311,9 +2292,9 @@ context.println "SXAEC: Definite problem section :-)"
cleanWorkspace,
cleanWorkspaceAfter,
cleanWorkspaceBuildOutputAfter,
filename,
useAdoptShellScripts,
enableSigner
enableSigner,
envVars
)
}
}
Expand All @@ -2324,8 +2305,8 @@ context.println "SXAEC: Definite problem section :-)"
cleanWorkspace,
cleanWorkspaceAfter,
cleanWorkspaceBuildOutputAfter,
filename,
useAdoptShellScripts
useAdoptShellScripts,
envVars
)
}
}
Expand All @@ -2339,8 +2320,8 @@ context.println "SXAEC: Definite problem section :-)"
context.docker.image(buildConfig.DOCKER_IMAGE).inside(buildConfig.DOCKER_ARGS+" "+dockerRunArg) {
buildScriptsAssemble(
cleanWorkspaceAfter,
filename,
useAdoptShellScripts
useAdoptShellScripts,
envVars
)
}
}
Expand Down Expand Up @@ -2371,16 +2352,16 @@ context.println "SXAEC: Definite problem section :-)"
cleanWorkspace,
cleanWorkspaceAfter,
cleanWorkspaceBuildOutputAfter,
filename,
useAdoptShellScripts
useAdoptShellScripts,
envVars
)
if ( enableSigner ) {
buildScriptsEclipseSigner()
context.println "openjdk_build_pipeline: running assemble phase (invocation 2)"
buildScriptsAssemble(
cleanWorkspaceAfter,
filename,
useAdoptShellScripts
useAdoptShellScripts,
envVars
)
}
}
Expand All @@ -2389,16 +2370,16 @@ context.println "SXAEC: Definite problem section :-)"
cleanWorkspace,
cleanWorkspaceAfter,
cleanWorkspaceBuildOutputAfter,
filename,
useAdoptShellScripts
useAdoptShellScripts,
envVars
)
if ( enableSigner ) {
buildScriptsEclipseSigner()
context.println "openjdk_build_pipeline: running assemble phase (invocation 3)"
buildScriptsAssemble(
cleanWorkspaceAfter,
filename,
useAdoptShellScripts
useAdoptShellScripts,
envVars
)
}
}
Expand Down

0 comments on commit e83f8f3

Please sign in to comment.