Skip to content

Commit

Permalink
Test
Browse files Browse the repository at this point in the history
  • Loading branch information
steelhead31 committed Dec 23, 2024
1 parent b7cea82 commit 4cadf29
Showing 1 changed file with 25 additions and 31 deletions.
56 changes: 25 additions & 31 deletions linux_new/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -824,36 +826,28 @@ 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"
echo "Target = ${RHELTarget}"
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
}
Expand Down

0 comments on commit 4cadf29

Please sign in to comment.