Don't clobber fixes to the pipeline

Author: twangboy

noxfile.py

@@ -1911,7 +1911,7 @@ def ci_test_onedir_pkgs(session):
     except CommandFailed:
         if os.environ.get("RERUN_FAILURES", "0") == "0":
             # Don't rerun on failures
-            return
+            sys.exit(1)
 
         # Don't print the system information, not the test selection on reruns
         global PRINT_TEST_SELECTION
@@ -1962,7 +1962,7 @@ def ci_test_onedir_pkgs(session):
         except CommandFailed:
             if os.environ.get("RERUN_FAILURES", "0") == "0":
                 # Don't rerun on failures
-                return
+                sys.exit(1)
             cmd_args = chunks["install"]
             pytest_args = (
                 common_pytest_args[:]

salt/version.py

@@ -456,7 +456,7 @@ def string(self):
             version_string += f".{self.mbugfix}"
         if self.pre_type:
             version_string += f"{self.pre_type}{self.pre_num}"
-        if self.noc and self.sha:
+        if self.noc is not None and self.sha:
             noc = self.noc
             if noc < 0:
                 noc = "0na"

tests/pytests/pkg/integration/test_version.py

@@ -104,7 +104,10 @@ def test_compare_versions(binary, install_salt):
     """
     Test compare versions
     """
-    version = install_salt.artifact_version
+    if install_salt.use_prev_version:
+        version = install_salt.prev_version
+    else:
+        version = install_salt.artifact_version
     if binary in install_salt.binary_paths:
         if install_salt.upgrade:
             install_salt.install()