diff --git a/build-farm/platform-specific-configurations/linux.sh b/build-farm/platform-specific-configurations/linux.sh index 4ae7505d4..e392a65ee 100755 --- a/build-farm/platform-specific-configurations/linux.sh +++ b/build-farm/platform-specific-configurations/linux.sh @@ -126,4 +126,7 @@ fi if [ "${VARIANT}" == "${BUILD_VARIANT_HOTSPOT_JFR}" ] && [ "${JAVA_TO_BUILD}" == "${JDK8_VERSION}" ] then export BUILD_ARGS="${BUILD_ARGS} -r https://github.com/AdoptOpenJDK/openjdk-jdk8u-jfr-incubator" + export BOOT_JDK_VERSION="8" + export BOOT_JDK_VARIABLE="JDK$(echo $BOOT_JDK_VERSION)_BOOT_DIR" + export JDK_BOOT_DIR="$(eval echo "\$$BOOT_JDK_VARIABLE")" fi diff --git a/pipelines/jobs/configurations/jdk12u.groovy b/pipelines/jobs/configurations/jdk12u.groovy index b8a5c6115..e0f484b93 100644 --- a/pipelines/jobs/configurations/jdk12u.groovy +++ b/pipelines/jobs/configurations/jdk12u.groovy @@ -43,4 +43,6 @@ targetConfigurations = [ ] ] +disableJob = true + return this \ No newline at end of file diff --git a/pipelines/jobs/pipeline_job_template.groovy b/pipelines/jobs/pipeline_job_template.groovy index a9d73b185..986d36390 100644 --- a/pipelines/jobs/pipeline_job_template.groovy +++ b/pipelines/jobs/pipeline_job_template.groovy @@ -33,6 +33,7 @@ pipelineJob("${BUILD_FOLDER}/${JOB_NAME}") { scriptPath(SCRIPT) } } + disabled(disableJob) concurrentBuild(false) triggers { cron(triggerSchedule)