Merge pull request #183 from mmadzin/rhel10

Update for RHEL10

Author: mmadzin

core/src/main/groovy/noe/common/utils/Platform.groovy

@@ -136,6 +136,10 @@ class Platform {
     return (isRHEL() && (osVersion ==~ /.*el9.*/)) || forceRhel9()
   }
 
+  boolean isRHEL10() {
+    return (isRHEL() && (osVersion ==~ /.*el10.*/)) || forceRhel10()
+  }
+
   boolean isSolaris11() {
     return isSolaris() && (osVersion ==~ /5\.11/)
   }
@@ -226,4 +230,8 @@ class Platform {
   private boolean forceRhel9() {
     return Boolean.parseBoolean(Library.getUniversalProperty('force.rhel.9', 'false'))
   }
+
+  private boolean forceRhel10() {
+    return Boolean.parseBoolean(Library.getUniversalProperty('force.rhel.10', 'false'))
+  }
 }

core/src/main/groovy/noe/common/utils/PlatformSuffixHelper.groovy

@@ -37,6 +37,7 @@ class PlatformSuffixHelper {
       else if (platform.isRHEL7()) platformName += "RHEL7-"
       else if (platform.isRHEL8()) platformName += "RHEL8-"
       else if (platform.isRHEL9()) platformName += "RHEL9-"
+      else if (platform.isRHEL10()) platformName += "RHEL10-"
       if (platform.isX86()) {
         platformName += "i686"
       } else if (platform.isX64()) {
@@ -115,6 +116,7 @@ class PlatformSuffixHelper {
       else if (platform.isRHEL7()) platformName += "RHEL7-"
       else if (platform.isRHEL8()) platformName += "RHEL8-"
       else if (platform.isRHEL9()) platformName += "RHEL9-"
+      else if (platform.isRHEL10()) platformName += "RHEL10-"
       if (platform.isX86()) {
         platformName += "i386"
       } else if (platform.isX64()) {

core/src/main/groovy/noe/ews/utils/AbstractJwsNameHelper.groovy

@@ -107,6 +107,7 @@ abstract class AbstractJwsNameHelper {
       else if (platform.isRHEL7()) result += 'RHEL7-'
       else if (platform.isRHEL8()) result += 'RHEL8-'
       else if (platform.isRHEL9()) result += 'RHEL9-'
+      else if (platform.isRHEL10()) result += 'RHEL10-'
       if (platform.isX86()) {
         result += "i386"
       } else if (platform.isX64()) {

core/src/main/groovy/noe/ews/utils/EwsUtils.groovy

@@ -584,6 +584,7 @@ class EwsUtils extends InstallerUtils {
       else if (platform.isRHEL7()) fn += "${version}-RHEL7-"
       else if (platform.isRHEL8()) fn += "${version}-RHEL8-"
       else if (platform.isRHEL9()) fn += "${version}-RHEL9-"
+      else if (platform.isRHEL10()) fn += "${version}-RHEL10-"
       if (platform.isX86()) {
         fn += "i386"
       } else if (platform.isX64()) {

core/src/main/groovy/noe/rhel/server/httpd/HttpdBaseOS.groovy

@@ -35,7 +35,7 @@ class HttpdBaseOS extends Httpd {
     this.logDirs = ['/logs']
     // what path will be taken as relative for star/stop cmd
     this.binPath = '/'
-    if (platform.isRHEL9() || platform.isRHEL8() || platform.isRHEL7()) {
+    if (platform.isRHEL10() || platform.isRHEL9() || platform.isRHEL8() || platform.isRHEL7()) {
       this.start = ['systemctl', 'start', serviceName]
       this.stop = ['systemctl', 'stop', serviceName]
     } else if (platform.isRHEL6()) {

core/src/main/groovy/noe/server/Httpd.groovy

@@ -386,7 +386,7 @@ abstract class Httpd extends ServerAbstract {
     }
     if(results.isEmpty()) {
       // Default if option is missing in configuration. RHEL7 and RHEL8 use '/logs/httpd.pid', RHEL9 '/run/httpd.pid'
-      return new File(getHttpdServerRootFull(), platform.isRHEL9() ? '/run/httpd.pid' : '/logs/httpd.pid')
+      return new File(getHttpdServerRootFull(), platform.isRHEL9() || platform.isRHEL10() ? '/run/httpd.pid' : '/logs/httpd.pid')
     } else {
       return results.first()
     }

core/src/main/groovy/noe/tomcat/configure/envars/RpmTomcatEnvVarsFileFactory.groovy

@@ -60,7 +60,7 @@ class RpmTomcatEnvVarsFileFactory {
   private static class Jws5RpmTomcatEnvVarsFile extends RpmTomcatEnvVarsFileBase {
     Jws5RpmTomcatEnvVarsFile() {
       Platform platform = new Platform()
-      if (platform.isRHEL8() || platform.isRHEL9()) {
+      if (platform.isRHEL8() || platform.isRHEL9() || platform.isRHEL10()) {
         this.envFile = new File('/etc/opt/rh/scls/jws5/sysconfig/tomcat')
       } else {
         this.envFile = new File('/etc/opt/rh/jws5/sysconfig/tomcat')

core/src/main/groovy/noe/workspace/WorkspaceHttpdBaseOS.groovy

@@ -9,7 +9,7 @@ class WorkspaceHttpdBaseOS extends WorkspaceAbstract {
 
   WorkspaceHttpdBaseOS() {
 
-    if (platform.isRHEL9() || platform.isRHEL8() || platform.isRHEL7()) {
+    if (platform.isRHEL10() || platform.isRHEL9() || platform.isRHEL8() || platform.isRHEL7()) {
       HttpdBaseOS server = new HttpdBaseOS(basedir, '2.4')
       serverController.addServer("httpd-24-1", server)
     } else if (platform.isRHEL6()) {

core/src/test/groovy/noe/tomcat/configure/envars/EnvVarsFileFactoryTest.groovy

@@ -53,7 +53,7 @@ class EnvVarsFileFactoryTest {
     ] as RpmTomcatEnvVarsFileFactory.RpmRun)
 
     String tomcatServicePath
-    if (platform.isRHEL8() || platform.isRHEL9()) {
+    if (platform.isRHEL8() || platform.isRHEL9() || platform.isRHEL10()) {
       tomcatServicePath = "/etc/opt/rh/scls/jws5/sysconfig/tomcat"
     } else {
       tomcatServicePath = "/etc/opt/rh/jws5/sysconfig/tomcat"
@@ -97,4 +97,3 @@ class EnvVarsFileFactoryTest {
   }
 
 }
-