From 4331f7ee3a16170a5ab4cdc0b9b3ebe0b8e5c878 Mon Sep 17 00:00:00 2001
From: Scott Fryer <scfryer@redhat.com>
Date: Fri, 10 Jan 2025 14:34:59 +0000
Subject: [PATCH] Test

---
 linux_new/Jenkinsfile | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/linux_new/Jenkinsfile b/linux_new/Jenkinsfile
index f6629ca22..95f942f52 100644
--- a/linux_new/Jenkinsfile
+++ b/linux_new/Jenkinsfile
@@ -8,7 +8,6 @@ def JVM = 'hotspot'
 
 // Artifactory Global Variables
 def baseURL = "https://github.com/adoptium/"
-// def artBaseURL = "https://adoptium.jfrog.io/artifactory/"
 
 // Github Artifact Repos
 def binaryRepo = "${params.VERSION.replace('jdk', 'temurin')}-binaries/releases/tag/${params.TAG}"
@@ -237,15 +236,15 @@ def CheckAndUpload(String Target, String Distro, String BuildArch, String RelVer
                 echo "Debian Sample Command:"
                 echo "jf 'rt u ${FILENAME} deb/pool/main/t/temurin-${VERSION}/ --target-props=${DISTROLIST}deb.component=main;deb.architecture=${BUILDARCH} --flat=true'"
                 // This Upload Works
-                // jf 'rt u ${FILENAME} deb/pool/main/t/temurin-${VERSION}/ --target-props=${DISTROLIST}deb.component=main;deb.architecture=${BUILDARCH} --flat=true'
+                jf 'rt u ${FILENAME} sfr-deb-test/pool/main/t/temurin-${VERSION}/ --target-props=${DISTROLIST}deb.component=main;deb.architecture=${BUILDARCH} --flat=true'
                break
            case "Alpine":
                echo "About To Upload Alpine File"
                echo "Debug 2003 - Alpine List"
                echo "Alpine Sample Command:"
-               echo "jf rt u **/build/ospackage/${FILENAME} apk/alpine/main/${BUILDARCH}/ --flat=true"
+               echo "jf rt u **/build/ospackage/${FILENAME} sfr-apk-test/alpine/main/${BUILDARCH}/ --flat=true"
                // This Upload Works
-               // jf 'rt u **/build/ospackage/${FILENAME} apk/alpine/main/${BUILDARCH}/ --flat=true'
+               jf 'rt u **/build/ospackage/${FILENAME} sfr-apk-test/alpine/main/${BUILDARCH}/ --flat=true'
                break
            case "RPMS":
               echo "About To Upload RPM File"
@@ -259,7 +258,6 @@ def CheckAndUpload(String Target, String Distro, String BuildArch, String RelVer
               // sh "ls -l ${FileName}"
               sh "ls -l ${FILENAME}"
               jf 'rt u ${FILENAME} ${PACKAGEDIR}/ --flat=true'
-              // jf 'rt u **/build/ospackage/${FILENAME} apk/alpine/main/${BUILDARCH}/ --flat=true'
               break
            default:
               echo "Default Case"
@@ -285,7 +283,6 @@ def CheckAndUpload(String Target, String Distro, String BuildArch, String RelVer
 
 // Function Definitions End
 
-
 /* Pipeline Declaration */
 pipeline {
     agent none  // No Default Agent
@@ -614,20 +611,6 @@ stage('Validate Artifacts') {
                         }
                         outputfile = "APKBUILD"
 
-                        // echo "Debug 05 Python Parameters For Alpine"
-                        // echo "Python 1 : Template Path = : ${templatebase}"
-                        // echo "Python 2 : Package Version = : ${packagever}"
-                        // echo "Python 3 : Package Arch = : ${packagearch}"
-                        // echo "Python 4 : Package URL = : ${PKURL}"
-                        // echo "Python 5 : Package Checksum = : ${PCSUM}"
-                        // echo "Python 6 : Package Name = : ${PFILE}"
-                        // echo "Python 7 : Output File Name = : ${outputfile}"
-                        // echo "Python 8 : Current Date = : ${currentDate}"
-                        // echo "Python 9 : Package Release Version = : ${PackageReleaseVersion}"
-                        // echo "Python 10: JDK Upstream Version = : ${upstreamversion}"
-                        // echo "Python 11 : Changelog Version = :${packagever}"
-                        // echo "Python 12: ARM32 Version = ${upstreamversion}"
-
                         // Figure Out Template name
                         templatebase = "./linux_new/${PTYPE}/${DistArrayElement}/src/main/packaging/${PRODUCT}/${Release}/${DistArrayElement}.${PTYPE}${Release}.template.j2"
 
@@ -974,11 +957,7 @@ stage('Build & Archive Package') {
                                 RHELarchitecture = "source"
                                 // echo "Overriden Architecture : ${RHELarchitecture}"
                             }                            
-                            // Calculate Key
-                            //  https://adoptium.jfrog.io/artifactory/rpm/fedora/39/source/Packages/temurin-17-jre-17.0.13.0.0.11-2.src.rpm
-                            //  https://adoptium.jfrog.io/artifactory/rpm/amazonlinux/2/source
-                            //  https://packages.adoptium.net/artifactory/rpm/fedora/rawhide/aarch64/Packages/temurin-11-jdk-11.0.25.0.0.9-1.aarch64.rpm
-                            //
+
                             rhel_distros.each { rhel_distro ->
                                 RHELkey = "${rhel_distro}/${RHELarchitecture}"
                                 // RHELTarget = "${artBaseURL}/${RHELkey}/Packages"