From 4cadf29dafaaf4a7dcc7307f351f389e9a27f6f9 Mon Sep 17 00:00:00 2001
From: Scott Fryer <scfryer@redhat.com>
Date: Mon, 23 Dec 2024 09:07:13 +0000
Subject: [PATCH] Test

---
 linux_new/Jenkinsfile | 56 +++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 31 deletions(-)

diff --git a/linux_new/Jenkinsfile b/linux_new/Jenkinsfile
index 26be487bb..cfa49c622 100644
--- a/linux_new/Jenkinsfile
+++ b/linux_new/Jenkinsfile
@@ -148,19 +148,21 @@ def getPackageBuildLabel(String arch, String distro) {
 // Helper function to check and upload files
 def CheckAndUpload(String Target, String Distro, String BuildArch, String Version, String DistroList, String Value, String PackageDir, String Key, String FileName) {
   echo "Entering Check & Upload"
-  // Received From Alpine CheckAndUpload(Target, UpDistro, buildArch, '', '', '', '', '' , FileName)
-  // Received From Deb    CheckAndUpload(DebTarget, DebDistro, arch, Release, distro_list, '', '', '', DebFileName)
+  // Received From Alpine : CheckAndUpload(Target, UpDistro, buildArch, '', '', '', '', '' , FileName)
+  // Received From Deb    : CheckAndUpload(DebTarget, DebDistro, arch, Release, distro_list, '', '', '', DebFileName)
+  // Received From RPM    : 
 
   echo "Debug 2001"
-  echo "Target = ${Target}"
-  echo "Distro = ${Distro}"
-  echo "Arch = ${BuildArch}"
-  echo "Version = ${Version}"
-  echo "DList = ${DistroList}"
-  echo "Value = ${Value}"
-  echo "PackageDir = ${PackageDir}"
-  echo "Key = ${Key}"
-  echo "Filename = ${FileName}"  
+  echo "${Target} ${Distro} ${BuildArch} ${Version} ${DistroList} ${Value} ${PackageDir} ${Key} ${FileName}"
+//   echo "Target = ${Target}"
+//   echo "Distro = ${Distro}"
+//   echo "Arch = ${BuildArch}"
+//   echo "Version = ${Version}"
+//   echo "DList = ${DistroList}"
+//   echo "Value = ${Value}"
+//   echo "PackageDir = ${PackageDir}"
+//   echo "Key = ${Key}"
+//   echo "Filename = ${FileName}"  
 }
 
 // Function Definitions End
@@ -824,9 +826,9 @@ stage('Build & Archive Package') {
                             // Calculate Key
                             rhel_distros.each { rhel_distro ->
                                 RHELkey = "${rhel_distro}/${RHELarchitecture}"
-                                echo "RHELKEY = ${RHELkey}"
                                 }
-                            def RHELTarget = "https://adoptium.jfrog.io/artifactory/rpm/${RHELkey}/Packages/${RHELFileName}"
+                            def RHELTarget = "https://adoptium.jfrog.io/artifactory/"
+                            // ${RHELkey}/Packages/${RHELFileName}"
                             // Key = amazonlinux/2/x86_64
                             // https://adoptium.jfrog.io/artifactory/rpm/amazonlinux/2/x86_64/Packages/temurin-23-jdk-23.0.1.0.0.11-0.x86_64.rpm
                             echo "Debug 1002 - RHEL Upload Debugging"
@@ -834,26 +836,18 @@ stage('Build & Archive Package') {
                             echo "Distro = ${RHELDistro}"
                             echo "Arch = ${RHELarchitecture}"
                             echo "Version = ${Release}"
-                            echo "DISTROLIST = "
-                            echo "FileName = ${RHELFileName}"
+                            echo "RHELKEY = ${RHELkey}"
                             echo "FilePath = ${RHELFilePath}"
-                            // echo "DistroList = ${distro_list}"
-                            // echo "RHEL FileName = ${RHELFileName}"
-                            // echo "Target = ${RHELTarget}"
-                    //         //CheckAndUpload(Target, Distro, arch, VERSION, DISTROLIST, '', '', '', RHELFileName )"
-                    // CheckAndUpload(Target, Distro, rpmArchList.each, '', '', VALUE , PACKAGEDIR, KEY, '' )
-                    //     }
-                    //     echo "Preparing For SUSE Upload"
-                    //     def PackFilesSUSE = findFiles(glob: "**/suse/build/ospackage/t*.rpm") // List All Packages To Upload For Temurin
-                    //     for (PackFile in PackFilesSUSE) {
-                    //         def FileName = PackFile.name
-                    //         // def Target = "https://adoptium.jfrog.io/artifactory/${PACKAGEDIR}/${KEY}/Packages/${FileName}"
-                    //         echo "SUSE FileName = ${FileName}"
-                    //         // echo "Target = ${Target}"
-                    //         //CheckAndUpload(Target, Distro, BUILDARCH, VERSION, DISTROLIST, '', '', '', '' )"
-                    //     }
+                            CheckAndUpload(RHELTarget, RHELDistro, RHELarchitecture, '', '', Release, , RHELkey, '', RHELFilePath )
+
+
+                           // From Original : CheckAndUpload(Target, Distro, rpmArchList.each, '', '', VALUE , PACKAGEDIR, KEY, '' )
+                           // case "RPMS": jf 'rt u **/build/ospackage/*.${VALUE}.rpm ${PACKAGEDIR}/${KEY}/Packages/ --flat=true'
+                           // Target = FilePath
+
+                    
                     }
-                }
+                } // End Of Linux Distro
               }
               // End OF Script
           }