Test

adoptium · Dec 20, 2024 · d22733a · d22733a
1 parent 40a0856
commit d22733a
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/linux_new/Jenkinsfile b/linux_new/Jenkinsfile
@@ -804,32 +804,35 @@ stage('Build & Archive Package') {
                             CheckAndUpload(DebTarget, DebDistro, arch, '', distro_list, '', '', '' , DebFileName)
                         }
                         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) {
+                            def 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}"
                             // Calculate Key
                             rhel_distros.each { rhel_distro ->
-                                RHELkey = rhel_distro
+                                RHELkey = "${rhel_distro}/${RHELarchitecture}"
                                 echo "RHELKEY = ${RHELkey}"
                                 }
-
-                            def RHELFileName = RHELPackFile.name
-                            def archex = RHELFileName =~ /(?:\d+\.\d+-\d+)\.(\w+)\.(?:src\.)?rpm/
-                            def architecture = archex ? archex[0][1] : null
-                            echo "Extracted architecture: ${architecture}"
-
-                            //def RHELTarget = "https://adoptium.jfrog.io/artifactory/rpm/${KEY}/Packages/${RHELFileName}"
+                            def RHELTarget = "https://adoptium.jfrog.io/artifactory/rpm/${KEY}/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 = ${DebDistro}"
-                            // echo "buildArch = ${arch}"
-                            // echo "Release = ${Release}"
+                            echo "Target = ${RHELTarget}"
+                            echo "Distro = ${RHELDistro}"
+                            echo "Arch = ${RHELarchitecture}"
+                            echo "Version = ${Release}"
+                            echo "DISTROLIST = "
                             echo "FileName = ${RHELFileName}"
+                            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