Test

Author: steelhead31

linux_new/Jenkinsfile

@@ -86,7 +86,7 @@ def TemurinVersion = "${params.TEMURIN_VERSION_INCREMENT}"
 /* Have Some Default Node Labels */
 /* Specified Here To Simplify Updates Later */
 
-def PKGBUILDLABELAPK = 'linux&&apkbuild&&buildx64&&dockerBuild'
+def PKGBUILDLABELAPK = 'linux&&apkbuild&&build&&x64&&dockerBuild'
 def PKGBUILDLABELDEB = 'build&&linux&&x64&&dockerBuild&&dynamicAzure'
 def PKGBUILDLABELRHEL = 'build&&linux&&x64&&dockerBuild&&dynamicAzure'
 
@@ -133,7 +133,7 @@ def cleanupFiles(files) {
 def getPackageBuildLabel(String arch, String distro) {
     switch (distro) {
         case 'APK':
-        if (arch == 'x64') {
+            if (arch == 'x64') {
                 return 'linux&&build&&x64&&dockerBuild'
             } else if (arch == 'aarch64') {
                 return 'build&&docker&&linux&&aarch64&&apkbuild'
@@ -185,7 +185,7 @@ def CheckAndUpload(String Target, String Distro, String BuildArch, String RelVer
         } else {
             echo "Target Doesnt Exist - Upload Files"
             // This Upload Works
-            // jf 'rt u ${FILENAME} deb/pool/main/t/temurin-${RELNUM}/ --target-props=${DISTROLIST}deb.component=main;deb.architecture=${BUILDARCH} --flat=true'
+            jf 'rt u ${FILENAME} deb/pool/main/t/temurin-${RELNUM}/ --target-props=${DISTROLIST}deb.component=main;deb.architecture=${BUILDARCH} --flat=true'
             break
         }
         case "Alpine":
@@ -197,7 +197,7 @@ def CheckAndUpload(String Target, String Distro, String BuildArch, String RelVer
             break
         } else {
             // This Upload Works
-            // jf 'rt u **/build/ospackage/${FILENAME} apk/alpine/main/${BUILDARCH}/ --flat=true'
+            jf 'rt u **/build/ospackage/${FILENAME} apk/alpine/main/${BUILDARCH}/ --flat=true'
             break
         }
         case "RPMS":
@@ -208,7 +208,7 @@ def CheckAndUpload(String Target, String Distro, String BuildArch, String RelVer
             echo "Target Exists - Skipping"
             break
         } else {
-            // jf 'rt u ${FILENAME} ${PACKAGEDIR}/ --flat=true'
+            jf 'rt u ${FILENAME} ${PACKAGEDIR}/ --flat=true'
             break
         }
         default:
@@ -907,10 +907,10 @@ post {
                 echo "Release : ${params.TAG}"
                 echo "FileName : ${ArchiveFileName}"
 
-                // build job: 'publish_linux_pkg_src', parameters: [
-                //     string(name: 'TAG', value: "${params.TAG}"),
-                //     string(name: 'FILENAME', value: "${ArchiveFileName}")
-                // ]
+                build job: 'publish_linux_pkg_src', parameters: [
+                    string(name: 'TAG', value: "${params.TAG}"),
+                    string(name: 'FILENAME', value: "${ArchiveFileName}")
+                ]
             } else {
                 echo 'Dry Run is enabled. Skipping downstream job trigger.'
             }