From f799c6830cfbc95b2f12efc8c89ed297836eda12 Mon Sep 17 00:00:00 2001 From: George Adams Date: Fri, 11 Mar 2022 09:48:24 +0000 Subject: [PATCH] remove downstream create_installer_linux job --- .../common/openjdk_build_pipeline.groovy | 30 ------------------- 1 file changed, 30 deletions(-) diff --git a/pipelines/build/common/openjdk_build_pipeline.groovy b/pipelines/build/common/openjdk_build_pipeline.groovy index dd73c2986..5792f1c01 100644 --- a/pipelines/build/common/openjdk_build_pipeline.groovy +++ b/pipelines/build/common/openjdk_build_pipeline.groovy @@ -537,34 +537,6 @@ class Build { flatten: true) } - /* - Run the Linux installer downstream job. - */ - private void buildLinuxInstaller(VersionInfo versionData) { - def filter = "**/OpenJDK*_linux_*.tar.gz" - def nodeFilter = "${buildConfig.TARGET_OS}&&fpm" - - String releaseType = "Nightly" - if (buildConfig.RELEASE) { - releaseType = "Release" - } - - // Execute installer job - context.build job: "build-scripts/release/create_installer_linux", - propagate: true, - parameters: [ - context.string(name: 'UPSTREAM_JOB_NUMBER', value: "${env.BUILD_NUMBER}"), - context.string(name: 'UPSTREAM_JOB_NAME', value: "${env.JOB_NAME}"), - context.string(name: 'FILTER', value: "${filter}"), - context.string(name: 'RELEASE_TYPE', value: "${releaseType}"), - context.string(name: 'VERSION', value: "${versionData.version}"), - context.string(name: 'MAJOR_VERSION', value: "${versionData.major}"), - context.string(name: 'ARCHITECTURE', value: "${buildConfig.ARCHITECTURE}"), - ['$class': 'LabelParameterValue', name: 'NODE_LABEL', label: "${nodeFilter}"] - ] - - } - /* Run the Windows installer downstream jobs. We run two jobs if we have a JRE (see https://github.com/adoptium/temurin-build/issues/1751). @@ -665,13 +637,11 @@ class Build { context.stage("installer") { switch (buildConfig.TARGET_OS) { case "mac": context.sh 'rm -f workspace/target/*.pkg workspace/target/*.pkg.json workspace/target/*.pkg.sha256.txt'; buildMacInstaller(versionData); break - case "linux": buildLinuxInstaller(versionData); break case "windows": buildWindowsInstaller(versionData); break default: break } // Archive the Mac and Windows pkg/msi - // (Linux installer job produces no artifacts, it just uploads rpm/deb to the repositories) if (buildConfig.TARGET_OS == "mac" || buildConfig.TARGET_OS == "windows") { try { context.sh 'for file in $(ls workspace/target/*.tar.gz workspace/target/*.pkg workspace/target/*.msi); do sha256sum "$file" > $file.sha256.txt ; done'