atex 2.0.dev1__tar.gz → 2.0.dev2__tar.gz

{atex-2.0.dev1 → atex-2.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: atex
-Version: 2.0.dev1
+Version: 2.0.dev2
 Summary: Ad-hoc Test EXecution
 Project-URL: Homepage, https://github.com/RHSecurityCompliance/atex
 License-Expression: GPL-3.0-or-later

{atex-2.0.dev1 → atex-2.0.dev2}/atex/cli/shvirt/common.py

@@ -13,7 +13,7 @@ def make_helper_cmd(args):
             "ssh",
             "-oLogLevel=ERROR",
             "-oStrictHostKeyChecking=no", "-oUserKnownHostsFile=/dev/null",
-            "-oConnectionAttempts=3", "-oServerAliveCountMax=4", "-oServerAliveInterval=5",
+            "-oConnectionAttempts=3", "-oServerAliveCountMax=10", "-oServerAliveInterval=30",
             "-oTCPKeepAlive=no", "-oEscapeChar=none", "-oRequestTTY=no",
             f"-oIdentityFile={str(Path(args.helper_sshkey).absolute())}",
             f"-oUser={args.helper_user}", f"-oHostname={args.helper_host}",

{atex-2.0.dev1 → atex-2.0.dev2}/atex/cli/virt/install.py

@@ -129,7 +129,6 @@ def install(args):
             "--graphics", "none",
             "--console", "pty",
             "--rng", "/dev/urandom",
-            "--os-variant", "rhel8-unknown",
             "--extra-args", (
                 "brltty=no "  # avoid heavy console spam on missing devices
                 "mitigations=off "  # make things a bit faster during install

{atex-2.0.dev1 → atex-2.0.dev2}/atex/provisioner/shvirt/shvirt.py

@@ -347,11 +347,22 @@ class SharedVirtProvisioner(Provisioner):
                 else:
                     break
 
-            self.logger.debug(f"adding {remote}")
+            # .stop() or .clear() was called while we were reserving,
+            # release the just-reserved Remote
+            abort = False
             with self._lock:
-                self._remotes.add(remote)
-                self._reserving_remotes.add(remote)
-                self._to_reserve -= 1
+                if self._to_reserve <= 0:
+                    abort = True
+                else:
+                    self._to_reserve -= 1
+                    self._remotes.add(remote)
+                    self._reserving_remotes.add(remote)
+            if abort:
+                self.logger.debug(f"releasing unrequested {remote}")
+                remote.release()
+                continue
+
+            self.logger.debug(f"created new {remote}")
             self._reserving_events.release(1)
 
             # delay for reserve_delay before reserving more
@@ -470,10 +481,8 @@ class SharedVirtProvisioner(Provisioner):
         return None
 
     def clear(self):
-        # if there's a reservation in progress, it will lower to_reserve
-        # to -1, but that's fine because the next .provision() will increase
-        # it back to >= 0 and a follow-up .get_remote() will get the one
-        # Remote that was reserved before
+        # any reservation in progress will be released, not returned
+        # via .get_remote(), when it completes
         with self._lock:
             self._to_reserve = 0
 

{atex-2.0.dev1 → atex-2.0.dev2}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 name = "atex"
 description = "Ad-hoc Test EXecution"
 readme = "README.md"
-version = "2.0.dev1"
+version = "2.0.dev2"
 license = "GPL-3.0-or-later"
 requires-python = ">= 3.12"
 dependencies = [