Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-order build pipeline build stages prior to AQA-tests #1087

Merged
merged 2 commits into from
Aug 1, 2024
Merged

Re-order build pipeline build stages prior to AQA-tests #1087

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
237a5d1
Re-order build pipeline build stages prio to AQA-tests
andrew-m-leonard Jul 31, 2024
a1b1989
Re-order build pipeline build stages prio to AQA-tests
andrew-m-leonard Jul 31, 2024
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
67 changes: 36 additions & 31 deletions pipelines/build/common/openjdk_build_pipeline.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2170,8 +2170,43 @@ class Build {
}
}

//buildInstaller if needed
if (enableInstallers) {
try {
// Installer job timeout managed by Jenkins job config
buildInstaller(versionInfo)
signInstaller(versionInfo)
} catch (FlowInterruptedException e) {
currentBuild.result = 'FAILURE'
throw new Exception("[ERROR] Installer job timeout (${buildTimeouts.INSTALLER_JOBS_TIMEOUT} HOURS) has been reached OR the downstream installer job failed. Exiting...")
}
}
if (!env.JOB_NAME.contains('pr-tester') && context.JENKINS_URL.contains('adopt')) {
try {
gpgSign()
} catch (Exception e) {
context.println(e.message)
currentBuild.result = 'FAILURE'
}
}

if (!env.JOB_NAME.contains('pr-tester')) { // pr-tester does not sign the binaries
// Verify Windows and Mac Signing for Temurin
if (buildConfig.VARIANT == 'temurin') {
try {
verifySigning()
} catch (Exception e) {
context.println(e.message)
currentBuild.result = 'FAILURE'
}
}
}

// Run Smoke Tests and AQA Tests
if (enableTests) {
if (currentBuild.currentResult != "SUCCESS") {
context.println("[ERROR] Build stages were not successful, not running AQA tests")
} else {
try {
//Only smoke tests succeed TCK and AQA tests will be triggerred.
if (runSmokeTests() == 'SUCCESS') {
Expand Down Expand Up @@ -2203,37 +2238,7 @@ class Build {
context.println(e.message)
currentBuild.result = 'FAILURE'
}
}

//buildInstaller if needed
if (enableInstallers) {
try {
// Installer job timeout managed by Jenkins job config
buildInstaller(versionInfo)
signInstaller(versionInfo)
} catch (FlowInterruptedException e) {
throw new Exception("[ERROR] Installer job timeout (${buildTimeouts.INSTALLER_JOBS_TIMEOUT} HOURS) has been reached OR the downstream installer job failed. Exiting...")
}
}
if (!env.JOB_NAME.contains('pr-tester') && context.JENKINS_URL.contains('adopt')) {
try {
gpgSign()
} catch (Exception e) {
context.println(e.message)
currentBuild.result = 'FAILURE'
}
}

if (!env.JOB_NAME.contains('pr-tester')) { // pr-tester does not sign the binaries
// Verify Windows and Mac Signing for Temurin
if (buildConfig.VARIANT == 'temurin') {
try {
verifySigning()
} catch (Exception e) {
context.println(e.message)
currentBuild.result = 'FAILURE'
}
}
}
}

// Compare reproducible build if needed
Expand Down