atex 2.0.dev1__py3-none-any.whl → 2.0.dev2__py3-none-any.whl

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/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/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.dist-info → atex-2.0.dev2.dist-info}/METADATA

@@ -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.dist-info → atex-2.0.dev2.dist-info}/RECORD

@@ -14,11 +14,11 @@ atex/cli/fmf.py,sha256=IbxeqeB2bD7mw-fsg41RE9kH5MN0FlfOh2bPxMFGTJk,2853
 atex/cli/reportportal.py,sha256=DA3Q_ZtlpJ6b0FYE4kam7BsJPz_UKQ9kB-wzQccUtrU,3392
 atex/cli/testingfarm.py,sha256=LDzNbsYEBejQkfN27xiDIjsm3CcSMe5aQSKha1Ml9ws,12325
 atex/cli/shvirt/__init__.py,sha256=cdaELDdri5Ph6Mw0f03KSD19mGZSvfLDgnn06UZ9DPo,4155
-atex/cli/shvirt/common.py,sha256=b407q54wuBUAoP1lBexIf0snZjRRnavnr_vKkyLkE5o,845
+atex/cli/shvirt/common.py,sha256=3F2Av8TtfOTQwLJpNFYXRbnPbIt1an8QVfLazFHggK0,847
 atex/cli/shvirt/install.py,sha256=LS4p6yO2URv5fvAw23f4PN65khi1VNquE-lEIBnzSKU,7144
 atex/cli/shvirt/reserve.py,sha256=EZc2cggLNYvjsvUA7QpmUDkyMNeYPf-XZ9m6CUSOWzw,6214
 atex/cli/virt/__init__.py,sha256=3sF314-jgx7OA8UokeHBTTHaFNwscFHFAQ7WxpIEgJk,1087
-atex/cli/virt/install.py,sha256=_d3dc77IozrJGLfjHwD1S8q9CxwW_XksK6Y87I5S-RE,6659
+atex/cli/virt/install.py,sha256=AP-XD09uM6M45QFMUuejMraM4JiK8EHSU5grdsIlmFU,6614
 atex/cli/virt/kickstart.py,sha256=K5_Mhg1UP-NAvhVLS0EqeJMn_ajrGj6b5ejfcrFqXPA,2651
 atex/cli/virt/ks.cfg,sha256=CtO4SnwJjvSj-TrTQBZNtxP9hwHNgeVAT-tAZPoD_YY,3472
 atex/cli/virt/reserve.py,sha256=wXxskNsnDVTuXqEVnDS0olrlNnrL4jkJToSW7kmqY4M,2050
@@ -60,7 +60,7 @@ atex/provisioner/podman/systemd.py,sha256=jgzjzLqDqGHlaCLSqPobzwD6-7s9JTaMekOMPZ
 atex/provisioner/podman/utils.py,sha256=c3gZpBXq1gX1DhH1B69MtO6VkGmnk8euOzQbdEcK1lg,4622
 atex/provisioner/shvirt/__init__.py,sha256=hf9TZOtVZ-jmOE5GkbetWhROmAHbZtNekqPZ-pciuTo,128
 atex/provisioner/shvirt/atex-virt-helper,sha256=kApbmInLB1iMnG12-BIsQiOnqdY0YtWjyxTYFFO5Mzk,22812
-atex/provisioner/shvirt/shvirt.py,sha256=IcjQkVs-3d51hS1OXcaUKQKxbCRSi2ySs9p7DrY3wo0,19464
+atex/provisioner/shvirt/shvirt.py,sha256=y6EiCAGCb469Fj7CGmIzEprlOKiouy7yQG6pENkDV1Q,19722
 atex/provisioner/tempvirt/__init__.py,sha256=4waqlJwJhEeGG2fNujLJbiJXD1tRnU3Ak1khr2Bo6yU,122
 atex/provisioner/tempvirt/tempvirt.py,sha256=KUG5uAEttcFOeVZkyAsfdkFRQfI8BOJIY08x5S5Hw8E,13394
 atex/provisioner/tempvirt/utils.py,sha256=q0uUwRLrgxMviA_wgQZ_yu0U3rZdkOKlagcaaRgjZas,6104
@@ -78,8 +78,8 @@ atex/util/path.py,sha256=60gVI-9VenMLPneavdQVm3FvfBVzG8EbxFjProbPiSM,528
 atex/util/ssh.py,sha256=kWrJ1W8dpMEJbz4deQr7RHI28fpeHy0qj898fZSE8nc,4380
 atex/util/subprocess.py,sha256=XvnKe22WcGIWiSSFpkareAyH7ttSAvvs_GGE6JYDMrk,2347
 atex/util/threads.py,sha256=00TwG3Ed1JfbYcwkTtfoUIFaOw_05_79SZBrfhz4T2I,5809
-atex-2.0.dev1.dist-info/METADATA,sha256=Ygr5XRN9-h7ABAGRHFyMUcL4IiAvXD5OgcrQVTRbidE,5707
-atex-2.0.dev1.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
-atex-2.0.dev1.dist-info/entry_points.txt,sha256=pLqJdcfeyQTgup2h6dWb6SvkHhtOl-W5Eg9zV8moK0o,39
-atex-2.0.dev1.dist-info/licenses/COPYING.txt,sha256=oEuj51jdmbXcCUy7pZ-KE0BNcJTR1okudRp5zQ0yWnU,670
-atex-2.0.dev1.dist-info/RECORD,,
+atex-2.0.dev2.dist-info/METADATA,sha256=siUs7y9BRb_wvGgAWpZ3cQELxk3oLU1TE-3jzR5q210,5707
+atex-2.0.dev2.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+atex-2.0.dev2.dist-info/entry_points.txt,sha256=pLqJdcfeyQTgup2h6dWb6SvkHhtOl-W5Eg9zV8moK0o,39
+atex-2.0.dev2.dist-info/licenses/COPYING.txt,sha256=oEuj51jdmbXcCUy7pZ-KE0BNcJTR1okudRp5zQ0yWnU,670
+atex-2.0.dev2.dist-info/RECORD,,