Merge remote-tracking branch 'apache/4.18' into main

.github/workflows/sonar-check.yml

@@ -29,7 +29,7 @@ concurrency:
 
 jobs:
   build:
-    if: github.repository == 'apache/cloudstack'
+    if: github.repository == 'apache/cloudstack' && github.event.pull_request.head.repo.full_name == github.repository
     name: Sonar JaCoCo Coverage
     runs-on: ubuntu-22.04
     steps:

api/src/main/java/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java

@@ -16,6 +16,7 @@
 // under the License.
 package org.apache.cloudstack.api.command.user.template;
 
+import org.apache.commons.lang3.BooleanUtils;
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.APICommand;
@@ -67,8 +68,9 @@ public class DeleteTemplateCmd extends BaseAsyncCmd {
     }
 
     public boolean isForced() {
-        return (forced != null) ? forced : true;
+        return BooleanUtils.toBooleanDefaultIfNull(forced, false);
     }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////

systemvm/debian/opt/cloud/bin/setup/init.sh

@@ -209,8 +209,7 @@ setup_interface_sshd() {
   fi
 
   systemctl restart systemd-journald
-  # Patch known systemd/sshd memory leak - https://github.com/systemd/systemd/issues/8015#issuecomment-476160981
-  echo '@include null' >> /etc/pam.d/systemd-user
+
   # Enable and Start SSH
   systemctl enable --now --no-block ssh
 }

test/integration/smoke/test_templates.py

@@ -115,6 +115,7 @@ class TestCreateTemplateWithChecksum(cloudstackTestCase):
                 cmd = deleteTemplate.deleteTemplateCmd()
                 cmd.id = temp.id
                 cmd.zoneid = self.zone.id
+                cmd.forced = True
                 self.apiclient.deleteTemplate(cmd)
         except Exception as e:
             raise Exception("Warning: Exception during cleanup : %s" % e)