From 71efa0ddcc6578fad4b627f6a000286fb115daf2 Mon Sep 17 00:00:00 2001 From: Scott Fryer Date: Mon, 23 Dec 2024 17:04:11 +0000 Subject: [PATCH] Test --- linux_new/Jenkinsfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/linux_new/Jenkinsfile b/linux_new/Jenkinsfile index 8c7109a29..2cb4f6025 100644 --- a/linux_new/Jenkinsfile +++ b/linux_new/Jenkinsfile @@ -815,7 +815,6 @@ stage('Build & Archive Package') { def RHELTarget = '' def RHELarchitecture = '' def RHELDistro = "RPMS" - def RHELrel = Release def RHELPackFiles = findFiles(glob: "**/rhel/build/ospackage/t*.rpm") // List All Packages To Upload For Temurin for (RHELPackFile in RHELPackFiles) { RHELFileName = RHELPackFile.name @@ -844,7 +843,7 @@ stage('Build & Archive Package') { echo "FileName = ${RHELFileName}" echo "FilePath = ${RHELFilePath}" // echo "DistroList = ${distro_list}" - CheckAndUpload(RHELTarget, RHELDistro, RHELarchitecture, '', '', RHELrel, RHELTarget, RHELkey, RHELFileName) + CheckAndUpload(RHELTarget, RHELDistro, RHELarchitecture, '', '', '', RHELTarget, RHELkey, RHELFileName) // From Original : CheckAndUpload(Target, Distro, rpmArchList.each, '', '', VALUE , PACKAGEDIR, KEY, '' ) // Received From Alpine : CheckAndUpload(Target, UpDistro, buildArch, '', '', '', '', '' , FileName) @@ -858,7 +857,6 @@ stage('Build & Archive Package') { def SUSETarget = '' def SUSEarchitecture = '' def SUSEDistro = "RPMS" - def SUSErel = Release def SUSEPackFiles = findFiles(glob: "**/suse/build/ospackage/t*.rpm") // List All Packages To Upload For Temurin for (SUSEPackFile in SUSEPackFiles) { SUSEFileName = SUSEPackFile.name @@ -887,7 +885,7 @@ stage('Build & Archive Package') { echo "FileName = ${SUSEFileName}" echo "FilePath = ${SUSEFilePath}" // echo "DistroList = ${distro_list}" - CheckAndUpload(SUSETarget, SUSEDistro, SUSEarchitecture, '', '', SUSErel, SUSETarget, SUSEkey, SUSEFileName) + CheckAndUpload(SUSETarget, SUSEDistro, SUSEarchitecture, '', '', '', SUSETarget, SUSEkey, SUSEFileName) // From Original : CheckAndUpload(Target, Distro, rpmArchList.each, '', '', VALUE , PACKAGEDIR, KEY, '' ) // Received From Alpine : CheckAndUpload(Target, UpDistro, buildArch, '', '', '', '', '' , FileName)