Test 1

adoptium · Oct 4, 2023 · 87a7b51 · 87a7b51
1 parent bbf6294
commit 87a7b51
Showing 1 changed file with 4 additions and 44 deletions.
diff --git a/linux/Jenkinsfile b/linux/Jenkinsfile
@@ -173,48 +173,17 @@ def CheckAndUpload(String Target, String Distro, String BuildArch, String Versio
       echo "Target Doesnt Exist - Upload Files"
       switch(Distro) {
            case "Debian":
-               echo "Target = ${Target}"
-               echo "Distro = ${Distro}"
-               echo "BuildArch = ${BUILDARCH}"
-               echo "Version = ${VERSION}"
-               echo "DistroList = ${DISTROLIST}"
-               echo "Value = ${VALUE}"
-               echo "PackageDir = ${PACKAGEDIR}"
-               echo "Key = ${KEY}"
-               // jf 'rt u **/build/ospackage/temurin-*${BUILDARCH}.deb deb/pool/main/t/temurin-${VERSION}/ --target-props=${DISTROLIST}deb.component=main;deb.architecture=${BUILDARCH} --flat=true'
+               jf 'rt u **/build/ospackage/temurin-*${BUILDARCH}.deb deb/pool/main/t/temurin-${VERSION}/ --target-props=${DISTROLIST}deb.component=main;deb.architecture=${BUILDARCH} --flat=true'
                break
            case "Alpine":
-              echo "Target = ${Target}"
-              echo "Distro = ${Distro}"
-              echo "BuildArch = ${BUILDARCH}"
-              echo "Version = ${VERSION}"
-              echo "DistroList = ${DISTROLIST}"
-              echo "Value = ${VALUE}"
-              echo "PackageDir = ${PACKAGEDIR}"
-              echo "Key = ${KEY}"
-               // jf 'rt u **/build/ospackage/temurin-*j*.apk apk/alpine/main/${BUILDARCH}/ --flat=true'
+               jf 'rt u **/build/ospackage/temurin-*j*.apk apk/alpine/main/${BUILDARCH}/ --flat=true'
                break
           case "RPMS":
-            echo "Target = ${Target}"
-            echo "Distro = ${Distro}"
-            echo "BuildArch = ${BUILDARCH}"
-            echo "Version = ${VERSION}"
-            echo "DistroList = ${DISTROLIST}"
-            echo "Value = ${VALUE}"
-            echo "PackageDir = ${PACKAGEDIR}"
-            echo "Key = ${KEY}"  // jf 'rt u **/build/ospackage/*.${VALUE}.rpm ${PACKAGEDIR}/${KEY}/Packages/ --flat=true'
+              jf 'rt u **/build/ospackage/*.${VALUE}.rpm ${PACKAGEDIR}/${KEY}/Packages/ --flat=true'
               break
            default:
               echo "Default Case"
-              echo "Target = ${Target}"
-              echo "Distro = ${Distro}"
-              echo "BuildArch = ${BUILDARCH}"
-              echo "Version = ${VERSION}"
-              echo "DistroList = ${DISTROLIST}"
-              echo "Value = ${VALUE}"
-              echo "PackageDir = ${PACKAGEDIR}"
-              echo "Key = ${KEY}"  // jf 'rt u **/build/ospackage/*.${VALUE}.rpm ${PACKAGEDIR}/${KEY}/Packages/ --flat=true'
-              // jf 'rt u **/build/ospackage/*.${VALUE}.rpm ${PACKAGEDIR}/${KEY}/Packages/ --flat=true'
+              jf 'rt u **/build/ospackage/*.${VALUE}.rpm ${PACKAGEDIR}/${KEY}/Packages/ --flat=true'
               break
        }
     }
@@ -368,13 +337,6 @@ def uploadAlpineArtifacts(String buildArch) {
       def Target = "https://adoptium.jfrog.io/artifactory/apk/alpine/main/${BUILDARCH}/${FileName}"
       CheckAndUpload(Target, Distro, buildArch, '', '', '', '', '' )
     }
-
-    // for (SrcFile in SrcFiles) {
-    //   def FileName = SrcFile.name
-    //   def Target = "https://adoptium.jfrog.io/artifactory/apk/alpine/main/${BUILDARCH}/${FileName}"
-    //   def CliCommand = "jf 'rt u **/build/ospackage/temurin-*j*.apk apk/alpine/main/${BUILDARCH}/ --flat=true'"
-    //   CheckAndUpload(Target, Distro)
-    // }
     // unset BUILDARCH environment variable
   }
 
@@ -432,7 +394,6 @@ def uploadDebArtifacts(String buildArch) {
               def FileName = PackFile.name
               def Target = "https://adoptium.jfrog.io/artifactory/deb/pool/main/t/temurin-${VERSION}/${FileName}"
 
-              // CheckAndUpload(Target, Distro)
               CheckAndUpload(Target, Distro, BUILDARCH, VERSION, DISTROLIST, '', '', '' )
             }
           }
@@ -512,7 +473,6 @@ def uploadRpmArtifacts(String DISTRO, String rpmArch) {
                       def FileName = PackFile.name
                       def Target = "https://adoptium.jfrog.io/artifactory/${PACKAGEDIR}/${KEY}/Packages/${FileName}"
 
-                      //CheckAndUpload(Target, Distro)
                       CheckAndUpload(Target, Distro, rpmArchList.each, '', '', VALUE , PACKAGEDIR, KEY )
                     }
                     break