Test

adoptium · Dec 23, 2024 · 0515699 · 0515699
1 parent 57144cc
commit 0515699
Showing 1 changed file with 7 additions and 36 deletions.
diff --git a/linux_new/Jenkinsfile b/linux_new/Jenkinsfile
@@ -815,6 +815,7 @@ 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
@@ -843,44 +844,14 @@ stage('Build & Archive Package') {
                             echo "FileName = ${RHELFileName}"
                             echo "FilePath = ${RHELFilePath}"
                             // echo "DistroList = ${distro_list}"
-                            CheckAndUpload(RHELTarget, RHELDistro, RHELarchitecture, '', '', '', RHELTarget, RHELkey, RHELFileName)
+                            CheckAndUpload(RHELTarget, RHELDistro, RHELarchitecture, '', '', RHELrel, RHELTarget, RHELkey, RHELFileName)
                             // From Original : CheckAndUpload(Target, Distro, rpmArchList.each, '', '', VALUE , PACKAGEDIR, KEY, '' )
+
+                            // Received From Alpine : CheckAndUpload(Target, UpDistro, buildArch, '', '', '', '', '' , FileName)
+                            // Received From Deb    : CheckAndUpload(DebTarget, DebDistro, arch, Release, distro_list, '', '', '', DebFileName)
+                            // Received From RPM    : 
+                            //   echo "${Target} ${Distro} ${BuildArch} ${Version} ${DistroList} ${Value} ${PackageDir} ${Key} ${FileName}"
                         }
-                        // echo "Preapring For RHEL Upload"
-                        // def RHELDistro = "RPMS"
-                        // def RHELPackFiles = findFiles(glob: "**/rhel/build/ospackage/t*.rpm") // List All Packages To Upload For Temurin
-                                                // for (RHELPackFile in RHELPackFiles) {
-                        //     RHELFileName = RHELPackFile.name
-                        //     def RHELFilePath = RHELPackFile.path
-                        //     def RHELarchex = RHELFileName =~ /(?:\d+\.\d+-\d+)\.(\w+)\.(?:src\.)?rpm/
-                        //     def RHELarchitecture = RHELarchex ? RHELarchex[0][1] : null
-                        //     echo "Extracted architecture: ${RHELarchitecture}"
-                        //     // OverRide Architecture For SRC RPMS
-                        //     if (RHELFileName.contains(".src.rpm")) {
-                        //         RHELarchitecture = "source"
-                        //         echo "Overriden Architecture : ${RHELarchitecture}"
-                        //     }                            
-                        //     // Calculate Key
-                        //     // rhel_distros.each { rhel_distro ->
-                        //     //     RHELkey = "${rhel_distro}/${RHELarchitecture}"
-                        //     //     }
-                        //     // RHELkey = "sosig"
-                        //     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"
-                        //     echo "Target = ${RHELTarget}"
-                        //     echo "Distro = ${RHELDistro}"
-                        //     echo "Arch = ${RHELarchitecture}"
-                        //     echo "Version = ${Release}"
-                        //     echo "RHELKEY = ${RHELkey}"
-                        //     echo "FilePath = ${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
-                        //    CheckAndUpload(RHELTarget, RHELDistro, RHELarchitecture, '', '', Release, '', RHELkey, '', RHELFilePath)
-                    //}
                 } // End Of Linux Distro
               }
               // End OF Script