Productionise jenkinsfile

adoptium · Jan 17, 2025 · ffe1e55 · ffe1e55
1 parent ed666c0
commit ffe1e55
Showing 1 changed file with 30 additions and 65 deletions.
diff --git a/linux_new/Jenkinsfile b/linux_new/Jenkinsfile
@@ -1,4 +1,5 @@
-/* Used By Jenkins Job sfr-build-linux-package-modular */
+/* Used By Jenkins Job create_installer_linux */
+/* https://ci.adoptium.net/job/build-scripts/job/release/job/create_installer_linux/ */
 
 /* Constant Declarations */
 
@@ -30,60 +31,33 @@ def deb_distros = [
 "bionic"   // Ubuntu/18.04 (LTS)
 ]
 
-// def rhel_distros = [
-//     'rpm/centos/7',
-//     'rpm/rocky/8',
-//     'rpm/rhel/7',
-//     'rpm/rhel/8',
-//     'rpm/rhel/9',
-//     'rpm/fedora/35',
-//     'rpm/fedora/36',
-//     'rpm/fedora/37',
-//     'rpm/fedora/38',
-//     'rpm/fedora/39',
-//     'rpm/fedora/40',
-//     'rpm/fedora/41',
-//     'rpm/fedora/42',
-//     'rpm/fedora/rawhide',
-//     'rpm/oraclelinux/7',
-//     'rpm/oraclelinux/8',
-//     'rpm/amazonlinux/2'
-//     ]
-
-// def suse_distros = [
-//     'rpm/opensuse/15.3',
-//     'rpm/opensuse/15.4',
-//     'rpm/opensuse/15.5',
-//     'rpm/sles/12',
-//     'rpm/sles/15'
-//     ]
 def rhel_distros = [
-'sfr-rpm-test/centos/7',
-'sfr-rpm-test/rocky/8',
-'sfr-rpm-test/rhel/7',
-'sfr-rpm-test/rhel/8',
-'sfr-rpm-test/rhel/9',
-'sfr-rpm-test/fedora/35',
-'sfr-rpm-test/fedora/36',
-'sfr-rpm-test/fedora/37',
-'sfr-rpm-test/fedora/38',
-'sfr-rpm-test/fedora/39',
-'sfr-rpm-test/fedora/40',
-'sfr-rpm-test/fedora/41',
-'sfr-rpm-test/fedora/42',
-'sfr-rpm-test/fedora/rawhide',
-'sfr-rpm-test/oraclelinux/7',
-'sfr-rpm-test/oraclelinux/8',
-'sfr-rpm-test/amazonlinux/2'
-]
+    'rpm/centos/7',
+    'rpm/rocky/8',
+    'rpm/rhel/7',
+    'rpm/rhel/8',
+    'rpm/rhel/9',
+    'rpm/fedora/35',
+    'rpm/fedora/36',
+    'rpm/fedora/37',
+    'rpm/fedora/38',
+    'rpm/fedora/39',
+    'rpm/fedora/40',
+    'rpm/fedora/41',
+    'rpm/fedora/42',
+    'rpm/fedora/rawhide',
+    'rpm/oraclelinux/7',
+    'rpm/oraclelinux/8',
+    'rpm/amazonlinux/2'
+    ]
 
 def suse_distros = [
-'sfr-rpm-test/opensuse/15.3',
-'sfr-rpm-test/opensuse/15.4',
-'sfr-rpm-test/opensuse/15.5',
-'sfr-rpm-test/sles/12',
-'sfr-rpm-test/sles/15'
-]
+    'rpm/opensuse/15.3',
+    'rpm/opensuse/15.4',
+    'rpm/opensuse/15.5',
+    'rpm/sles/12',
+    'rpm/sles/15'
+    ]
 /* End Of Distro Definitions*/
 
 // Global Variables
@@ -212,7 +186,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} sfr-deb-test/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":
@@ -224,7 +198,7 @@ def CheckAndUpload(String Target, String Distro, String BuildArch, String RelVer
             break
         } else {
             // This Upload Works
-            jf 'rt u **/build/ospackage/${FILENAME} sfr-apk-test/alpine/main/${BUILDARCH}/ --flat=true'
+            jf 'rt u **/build/ospackage/${FILENAME} apk/alpine/main/${BUILDARCH}/ --flat=true'
             break
         }
         case "RPMS":
@@ -810,7 +784,7 @@ stage('Publish Packages') {
                 for (AlpPackFile in AllFiles) {
                     def AlpFileName = AlpPackFile.name
                     def AlpFilePath = AlpPackFile.path
-                    def Target = "sfr-apk-test/alpine/main/${AlpArch}" // ZZZZZZZZZZZ
+                    def Target = "apk/alpine/main/${AlpArch}"
                     CheckAndUpload(Target, AlpDistro, AlpArch, '', '', '', '', '' , AlpFileName)
                 }
             }
@@ -828,7 +802,7 @@ stage('Publish Packages') {
             for (DebPackFile in DebPackFiles) {
                 DebFileName = DebPackFile.name
                 def DebFilePath = DebPackFile.path
-                DebTarget = "sfr-deb-test/pool/main/t/temurin-${Release}" // ZZZZZZZZZZ
+                DebTarget = "deb/pool/main/t/temurin-${Release}"
                 def DebArchEx = (DebFileName =~ /_(\w+)\.deb$/)
                 def DebArch = DebArchEx[0][1]
                 CheckAndUpload(DebTarget, DebDistro, DebArch,, '', distro_list, '', '', DebFileName, DebPackFile.path)
@@ -856,15 +830,6 @@ stage('Publish Packages') {
                 RHELTarget = "${RHELkey}/Packages"
                 CheckAndUpload(RHELTarget, RHELDistro, RHELarchitecture, '', '', RHELFileName, RHELTarget, RHELkey, RHELFilePath)
             }
-            echo "Debug 1001 - RHEL Upload Debugging"
-            echo "Target = ${RHELTarget}"
-            echo "Key = ${RHELkey}"
-            echo "Value = ${Release}"
-            echo "Distro = ${RHELDistro}"
-            echo "PackageDir = ${RHELTarget}"
-            echo "buildArch = ${RHELarchitecture}"
-            echo "FileName = ${RHELFileName}"
-            echo "FilePath = ${RHELFilePath}"
         }
         echo "Preapring For SUSE Upload"
         def SUSEFileName = ''