From 79d0a9167cc65c1941308be87866420126a4526c Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Tue, 19 Mar 2024 10:17:38 +0000 Subject: [PATCH] Build a linux devkit Signed-off-by: Andrew Leonard --- pipelines/defaults.json | 3 +-- pipelines/jobs/configurations/jdk21u_pipeline_config.groovy | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pipelines/defaults.json b/pipelines/defaults.json index d473a5a4c..72cdbdeb9 100644 --- a/pipelines/defaults.json +++ b/pipelines/defaults.json @@ -9,8 +9,7 @@ }, "jenkinsDetails" : { "rootUrl" : "https://ci.adoptium.net", - "rootDirectory" : "build-scripts", - "devkitJobRoot" : "https://ci.adoptium.net/job/build-scripts/job/utils/job/devkit" + "rootDirectory" : "build-scripts" }, "templateDirectories" : { "downstream" : "pipelines/build/common/create_job_from_template.groovy", diff --git a/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy index e2edfc4c5..b9186225e 100644 --- a/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy @@ -21,7 +21,6 @@ class Config21 { x64Linux : [ os : 'linux', arch : 'x64', - devkit : 'job/jdk21u/job/devkit_jdk21u_x64Linux/10/artifact/workspace/devkit-jdk21u-x86_64-linux-gnu.tar.gz', dockerImage : 'adoptopenjdk/centos7_build_image', dockerFile: [ openj9 : 'pipelines/build/dockerFiles/cuda.dockerfile' @@ -113,7 +112,6 @@ class Config21 { ppc64leLinux : [ os : 'linux', arch : 'ppc64le', - devkit : 'job/jdk21u/job/devkit_jdk21u_ppc64leLinux/2/artifact/workspace/devkit-jdk21u-ppc64le-linux-gnu.tar.gz', dockerImage : 'adoptopenjdk/centos7_build_image', test : 'default', reproducibleCompare : [ @@ -130,7 +128,6 @@ class Config21 { aarch64Linux : [ os : 'linux', arch : 'aarch64', - devkit : 'job/jdk21u/job/devkit_jdk21u_aarch64Linux/18/artifact/workspace/devkit-jdk21u-aarch64-linux-gnu.tar.gz', dockerImage : 'adoptopenjdk/centos7_build_image', test : 'default', reproducibleCompare : [