From bbd6009b9e9833983791a1ad994b7e59322900f4 Mon Sep 17 00:00:00 2001
From: Alyssa Rock <alyssa.rock@gmail.com>
Date: Fri, 8 Sep 2023 10:55:44 -0600
Subject: [PATCH 01/65] Fix warning box on 3006.3 release notes

---
 doc/topics/releases/3006.3.md | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/doc/topics/releases/3006.3.md b/doc/topics/releases/3006.3.md
index 2f2b0713936..f44231808f6 100644
--- a/doc/topics/releases/3006.3.md
+++ b/doc/topics/releases/3006.3.md
@@ -12,13 +12,10 @@ for a given release.
 Add release specific details below
 -->
 
-.. Warning::
-    Due to a known issue with the newest release of setuptools,
-    users who use pip to install Salt will experience an install
-    failure. This issue also impacts pip installs for older versions
-    of Salt. The core Salt team is currently investigating the issue
-    and has documented a workaround. To follow the issue and get the
-    latest workaround, see: https://github.com/saltstack/salt/issues/65149
+| **IMPORTANT** |
+| ------------- |
+| Due to a known issue with the newest release of setuptools, users who use pip to install Salt will experience an install failure. This issue also impacts pip installs for older versions of Salt. The core Salt team is currently investigating the issue and has documented a workaround. To follow the issue and get the latest workaround, see: <https://github.com/saltstack/salt/issues/65149> |
+
 
 <!--
 Do not edit the changelog below.

From 4bc5a4deb8fd2966ad9f67749c2f240f6ce78832 Mon Sep 17 00:00:00 2001
From: jeanluc <lkubb@protonmail.com>
Date: Wed, 5 Jul 2023 12:18:40 +0200
Subject: [PATCH 02/65] Add tests for issue 64597

---
 .../functional/modules/test_x509_v2.py        | 37 +++++++++++++++++--
 .../pytests/functional/states/test_x509_v2.py | 15 ++++++++
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/tests/pytests/functional/modules/test_x509_v2.py b/tests/pytests/functional/modules/test_x509_v2.py
index 00d8ae6ba9c..42b55d66a6c 100644
--- a/tests/pytests/functional/modules/test_x509_v2.py
+++ b/tests/pytests/functional/modules/test_x509_v2.py
@@ -1424,13 +1424,20 @@ def test_create_private_key_pkcs12(x509, passphrase):
 
 @pytest.mark.parametrize("encoding", ["pem", "der"])
 def test_create_private_key_write_to_path(x509, encoding, tmp_path):
-    tgt = tmp_path / "csr"
+    tgt = tmp_path / "pk"
     x509.create_private_key(encoding=encoding, path=str(tgt))
     assert tgt.exists()
     if encoding == "pem":
         assert tgt.read_text().startswith("-----BEGIN PRIVATE KEY-----")
 
 
+def test_create_private_key_write_to_path_encrypted(x509, tmp_path):
+    tgt = tmp_path / "pk"
+    x509.create_private_key(path=str(tgt), passphrase="hunter1")
+    assert tgt.exists()
+    assert tgt.read_text().startswith("-----BEGIN ENCRYPTED PRIVATE KEY-----")
+
+
 @pytest.mark.parametrize("encoding", ["pem", "der"])
 def test_create_private_key_write_to_path_overwrite(x509, encoding, tmp_path):
     tgt = tmp_path / "cert"
@@ -1589,8 +1596,32 @@ def test_verify_crl(x509, crl, ca_cert):
     assert x509.verify_crl(crl, ca_cert) is True
 
 
-def test_verify_private_key(x509, ca_key, ca_cert):
-    assert x509.verify_private_key(ca_key, ca_cert) is True
+def test_encode_private_key(x509, rsa_privkey):
+    pk = x509.create_private_key()
+    res = x509.encode_private_key(pk)
+    assert res.strip() == pk.strip()
+
+
+def test_encode_private_key_encrypted(x509, ca_key, ca_key_enc):
+    pk = x509.create_private_key()
+    pk_enc = x509.encode_private_key(pk, passphrase="hunter1")
+    res = x509.encode_private_key(pk_enc, private_key_passphrase="hunter1")
+    assert res.strip() == pk.strip()
+
+
+@pytest.mark.parametrize("privkey,expected", [("ca_key", True), ("rsa_privkey", False)])
+def test_verify_private_key(x509, request, privkey, expected, ca_cert):
+    pk = request.getfixturevalue(privkey)
+    assert x509.verify_private_key(pk, ca_cert) is expected
+
+
+def test_verify_private_key_with_passphrase(x509, ca_key_enc, ca_cert):
+    assert (
+        x509.verify_private_key(
+            ca_key_enc, ca_cert, passphrase="correct horse battery staple"
+        )
+        is True
+    )
 
 
 @pytest.mark.parametrize("algo", ["rsa", "ec", "ed25519", "ed448"])
diff --git a/tests/pytests/functional/states/test_x509_v2.py b/tests/pytests/functional/states/test_x509_v2.py
index e74bdd73f37..7409e6683ed 100644
--- a/tests/pytests/functional/states/test_x509_v2.py
+++ b/tests/pytests/functional/states/test_x509_v2.py
@@ -2170,6 +2170,21 @@ def test_private_key_managed_existing(x509, pk_args):
     _assert_not_changed(ret)
 
 
+@pytest.mark.usefixtures("existing_pk")
+@pytest.mark.parametrize(
+    "existing_pk",
+    [
+        {"algo": "rsa", "keysize": 3072},
+    ],
+    indirect=True,
+)
+def test_private_key_managed_existing_keysize_change_to_default(x509, pk_args):
+    pk_args.pop("keysize")
+    ret = x509.private_key_managed(**pk_args)
+    assert ret.changes
+    assert ret.changes["keysize"] == 2048
+
+
 @pytest.mark.usefixtures("existing_pk")
 def test_private_key_managed_existing_new(x509, pk_args):
     cur = _get_privkey(pk_args["name"])

From ab2a5087611ef24261f1aa9ea1b4a3a232db4a57 Mon Sep 17 00:00:00 2001
From: jeanluc <lkubb@protonmail.com>
Date: Wed, 5 Jul 2023 12:20:09 +0200
Subject: [PATCH 03/65] Fix `x509_v2` privkey handling/reporting, correct docs

---
 changelog/64597.fixed.md |  1 +
 salt/modules/x509_v2.py  | 38 ++++++++++++++++++++++++++++++--------
 salt/states/x509_v2.py   |  6 +++---
 3 files changed, 34 insertions(+), 11 deletions(-)
 create mode 100644 changelog/64597.fixed.md

diff --git a/changelog/64597.fixed.md b/changelog/64597.fixed.md
new file mode 100644
index 00000000000..1810ce5ebb8
--- /dev/null
+++ b/changelog/64597.fixed.md
@@ -0,0 +1 @@
+Fixed some issues in x509_v2 execution module private key functions
diff --git a/salt/modules/x509_v2.py b/salt/modules/x509_v2.py
index 0725b1b5624..ba26d7b6b2e 100644
--- a/salt/modules/x509_v2.py
+++ b/salt/modules/x509_v2.py
@@ -255,8 +255,8 @@ def create_certificate(
         Instead of returning the certificate, write it to this file path.
 
     overwrite
-        If ``path`` is specified and the file exists, do not overwrite it.
-        Defaults to false.
+        If ``path`` is specified and the file exists, overwrite it.
+        Defaults to true.
 
     raw
         Return the encoded raw bytes instead of a string. Defaults to false.
@@ -614,7 +614,7 @@ def _create_certificate_local(
             path=os.path.join(copypath, f"{prepend}{cert.serial_number:x}.crt"),
             pem_type="CERTIFICATE",
         )
-    return builder.sign(signing_private_key, algorithm=algorithm), private_key_loaded
+    return cert, private_key_loaded
 
 
 def encode_certificate(
@@ -1196,7 +1196,7 @@ def create_private_key(
     keysize
         For ``rsa``, specifies the bitlength of the private key (2048, 3072, 4096).
         For ``ec``, specifies the NIST curve to use (256, 384, 521).
-        Irrelevant for Edwards-curve schemes (`ed25519``, ``ed448``).
+        Irrelevant for Edwards-curve schemes (``ed25519``, ``ed448``).
         Defaults to 2048 for RSA and 256 for EC.
 
     passphrase
@@ -1246,6 +1246,7 @@ def create_private_key(
         raise CommandExecutionError(
             f"Invalid value '{encoding}' for encoding. Valid: der, pem, pkcs12"
         )
+
     out = encode_private_key(
         _generate_pk(algo=algo, keysize=keysize),
         encoding=encoding,
@@ -1258,7 +1259,9 @@ def create_private_key(
         return out
 
     if encoding == "pem":
-        return write_pem(out.decode(), path, pem_type="(?:RSA )?PRIVATE KEY")
+        return write_pem(
+            out.decode(), path, pem_type="(?:(RSA|ENCRYPTED) )?PRIVATE KEY"
+        )
     with salt.utils.files.fopen(path, "wb") as fp_:
         fp_.write(out)
     return
@@ -1268,6 +1271,7 @@ def encode_private_key(
     private_key,
     encoding="pem",
     passphrase=None,
+    private_key_passphrase=None,
     pkcs12_encryption_compat=False,
     raw=False,
 ):
@@ -1280,7 +1284,7 @@ def encode_private_key(
 
         salt '*' x509.encode_private_key /etc/pki/my.key der
 
-    csr
+    private_key
         The private key to encode.
 
     encoding
@@ -1288,6 +1292,23 @@ def encode_private_key(
         as a ``pem`` string, base64-encoded ``der`` and base64-encoded ``pkcs12``.
         Defaults to ``pem``.
 
+    passphrase
+        If this is specified, the private key will be encrypted using this
+        passphrase. The encryption algorithm cannot be selected, it will be
+        determined automatically as the best available one.
+
+    private_key_passphrase
+        .. versionadded:: 3006.2
+
+        If the current ``private_key`` is encrypted, the passphrase to
+        decrypt it.
+
+    pkcs12_encryption_compat
+        Some operating systems are incompatible with the encryption defaults
+        for PKCS12 used since OpenSSL v3. This switch triggers a fallback to
+        ``PBESv1SHA1And3KeyTripleDESCBC``.
+        Please consider the `notes on PKCS12 encryption <https://cryptography.io/en/stable/hazmat/primitives/asymmetric/serialization/#cryptography.hazmat.primitives.serialization.pkcs12.serialize_key_and_certificates>`_.
+
     raw
         Return the encoded raw bytes instead of a string. Defaults to false.
     """
@@ -1295,6 +1316,7 @@ def encode_private_key(
         raise CommandExecutionError(
             f"Invalid value '{encoding}' for encoding. Valid: der, pem, pkcs12"
         )
+    private_key = x509util.load_privkey(private_key, passphrase=private_key_passphrase)
     if passphrase is None:
         cipher = serialization.NoEncryption()
     else:
@@ -1553,7 +1575,7 @@ def get_public_key(key, passphrase=None, asObj=None):
     except SaltInvocationError:
         pass
     raise CommandExecutionError(
-        "Could not load key as certificate, public key, private key, CSR or CRL"
+        "Could not load key as certificate, public key, private key or CSR"
     )
 
 
@@ -1940,7 +1962,7 @@ def verify_private_key(private_key, public_key, passphrase=None):
     passphrase
         If ``private_key`` is encrypted, the passphrase to decrypt it.
     """
-    privkey = x509util.load_privkey(private_key, passphrase=None)
+    privkey = x509util.load_privkey(private_key, passphrase=passphrase)
     pubkey = x509util.load_pubkey(get_public_key(public_key))
     return x509util.is_pair(pubkey, privkey)
 
diff --git a/salt/states/x509_v2.py b/salt/states/x509_v2.py
index 35790fff24a..ee04eba610a 100644
--- a/salt/states/x509_v2.py
+++ b/salt/states/x509_v2.py
@@ -82,7 +82,7 @@ the certificate to the mine, where it can be easily retrieved by other minions.
         - keysize: 4096
         - backup: true
         - require:
-          - file: /etc/pki
+          - file: /etc/pki/issued_certs
 
     Create self-signed CA certificate:
       x509.certificate_managed:
@@ -1274,7 +1274,7 @@ def private_key_managed(
     keysize
         For ``rsa``, specifies the bitlength of the private key (2048, 3072, 4096).
         For ``ec``, specifies the NIST curve to use (256, 384, 521).
-        Irrelevant for Edwards-curve schemes (`ed25519``, ``ed448``).
+        Irrelevant for Edwards-curve schemes (``ed25519``, ``ed448``).
         Defaults to 2048 for RSA and 256 for EC.
 
     passphrase
@@ -1450,7 +1450,7 @@ def private_key_managed(
                 and algo in ("rsa", "ec")
                 and current.key_size != check_keysize
             ):
-                changes["keysize"] = keysize
+                changes["keysize"] = check_keysize
             if encoding != current_encoding:
                 changes["encoding"] = encoding
         elif file_exists and new:

From 46b04df31ecaa4bd64096083d8f4322df6cc71cd Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Fri, 8 Sep 2023 14:49:26 -0400
Subject: [PATCH 04/65] Replace `Content-Type: application/json` with
 `Content-Type: application/x-www-form-urlencoded`

---
 salt/netapi/rest_cherrypy/app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/netapi/rest_cherrypy/app.py b/salt/netapi/rest_cherrypy/app.py
index f60ee90e47d..e65bca8f2d9 100644
--- a/salt/netapi/rest_cherrypy/app.py
+++ b/salt/netapi/rest_cherrypy/app.py
@@ -1416,7 +1416,7 @@ class Minions(LowDataAdapter):
             POST /minions HTTP/1.1
             Host: localhost:8000
             Accept: application/x-yaml
-            Content-Type: application/json
+            Content-Type: application/x-www-form-urlencoded
 
             tgt=*&fun=status.diskusage
 

From 79096a5118f3d88bdd0748f358163c5e65612a45 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Tue, 27 Jun 2023 16:42:56 -0400
Subject: [PATCH 05/65] Fix the debian upgrade problem from 3006.0 to 3006.1 or
 later versions

---
 pkg/debian/control | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/debian/control b/pkg/debian/control
index 0d055c763e5..f4408d28116 100644
--- a/pkg/debian/control
+++ b/pkg/debian/control
@@ -77,6 +77,8 @@ Description: remote manager to administer servers via salt
 
 Package: salt-minion
 Architecture: amd64 arm64
+Replaces: salt-common (<< 3006.1)
+Breaks: salt-common (<< 3006.1)
 Depends: bsdmainutils,
          dctrl-tools,
          salt-common (= ${source:Version}),

From b167d2aa2ad7541edafb38901a4ebb638b5afde7 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Fri, 14 Jul 2023 16:18:41 -0400
Subject: [PATCH 06/65] Add back the test for the retention of pip packages

---
 pkg/tests/support/helpers.py           |  7 +++++++
 pkg/tests/upgrade/test_salt_upgrade.py | 28 ++++++++++++++++----------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py
index 11bfdb6185b..f6c779dbf76 100644
--- a/pkg/tests/support/helpers.py
+++ b/pkg/tests/support/helpers.py
@@ -626,6 +626,13 @@ class SaltPkgInstall:
         log.info(ret)
         self._check_retcode(ret)
 
+    def package_python_version(self):
+        return self.proc.run(
+            self.binary_paths["python"],
+            "-c",
+            "import sys; print('{}.{}'.format(*sys.version_info))",
+        ).stdout
+
     def install(self, upgrade=False):
         if self.compressed:
             self._install_compressed(upgrade=upgrade)
diff --git a/pkg/tests/upgrade/test_salt_upgrade.py b/pkg/tests/upgrade/test_salt_upgrade.py
index 0514eb619c0..cc0dec33fe4 100644
--- a/pkg/tests/upgrade/test_salt_upgrade.py
+++ b/pkg/tests/upgrade/test_salt_upgrade.py
@@ -1,36 +1,42 @@
 import pytest
 
 
-def test_salt_upgrade(salt_call_cli, salt_minion, install_salt):
+def test_salt_upgrade(salt_call_cli, install_salt):
     """
-    Test upgrade of Salt
+    Test an upgrade of Salt.
     """
     if not install_salt.upgrade:
         pytest.skip("Not testing an upgrade, do not run")
-    # verify previous install version is setup correctly and works
+
+    original_py_version = install_salt.package_python_version()
+
+    # Verify previous install version is setup correctly and works
     ret = salt_call_cli.run("test.ping")
     assert ret.returncode == 0
     assert ret.data
 
-    # test pip install before an upgrade
+    # Test pip install before an upgrade
     dep = "PyGithub==1.56.0"
-    repo = "https://github.com/saltstack/salt.git"
     install = salt_call_cli.run("--local", "pip.install", dep)
     assert install.returncode == 0
+
+    # Verify we can use the module dependent on the installed package
+    repo = "https://github.com/saltstack/salt.git"
     use_lib = salt_call_cli.run("--local", "github.get_repo_info", repo)
     assert "Authentication information could" in use_lib.stderr
 
-    # upgrade Salt from previous version and test
+    # Upgrade Salt from previous version and test
+    new_py_version = install_salt.package_python_version()
     install_salt.install(upgrade=True)
     ret = salt_call_cli.run("test.ping")
     assert ret.returncode == 0
     assert ret.data
 
-    # install dep following upgrade
-    # TODO: Remove this once we figure out how to
-    # preserve things installed via PIP between upgrades.
-    install = salt_call_cli.run("--local", "pip.install", dep)
-    assert install.returncode == 0
+    # Install dep following upgrade
+    # TODO: This should be removed when we stop testing against versions < 3006.0
+    if not install_salt.relenv and original_py_version == new_py_version:
+        install = salt_call_cli.run("--local", "pip.install", dep)
+        assert install.returncode == 0
 
     # test pip install after an upgrade
     use_lib = salt_call_cli.run("--local", "github.get_repo_info", repo)

From afb229431cd75f0048674d94987f1fc0d8c24a22 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Tue, 18 Jul 2023 16:49:39 -0400
Subject: [PATCH 07/65] Add downgrade option for the install salt fixture

---
 pkg/tests/conftest.py        | 7 +++++++
 pkg/tests/support/helpers.py | 1 +
 2 files changed, 8 insertions(+)

diff --git a/pkg/tests/conftest.py b/pkg/tests/conftest.py
index 257f4615fb3..66b5b637c20 100644
--- a/pkg/tests/conftest.py
+++ b/pkg/tests/conftest.py
@@ -87,6 +87,12 @@ def pytest_addoption(parser):
         action="store_true",
         help="Install previous version and then upgrade then run tests",
     )
+    test_selection_group.addoption(
+        "--downgrade",
+        default=False,
+        action="store_true",
+        help="Install current version and then downgrade to the previous version and run tests",
+    )
     test_selection_group.addoption(
         "--no-install",
         default=False,
@@ -168,6 +174,7 @@ def install_salt(request, salt_factories_root_dir):
         conf_dir=salt_factories_root_dir / "etc" / "salt",
         system_service=request.config.getoption("--system-service"),
         upgrade=request.config.getoption("--upgrade"),
+        downgrade=request.config.getoption("--downgrade"),
         no_uninstall=request.config.getoption("--no-uninstall"),
         no_install=request.config.getoption("--no-install"),
         classic=request.config.getoption("--classic"),
diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py
index f6c779dbf76..f27d2400d81 100644
--- a/pkg/tests/support/helpers.py
+++ b/pkg/tests/support/helpers.py
@@ -74,6 +74,7 @@ class SaltPkgInstall:
     # The artifact is an installer (exe, msi, pkg, rpm, deb)
     installer_pkg: bool = attr.ib(default=False)
     upgrade: bool = attr.ib(default=False)
+    downgrade: bool = attr.ib(default=False)
     # install salt or not. This allows someone
     # to test a currently installed version of salt
     no_install: bool = attr.ib(default=False)

From bc3d04d20746d63a7824b787de031fc4ef3f11be Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Wed, 19 Jul 2023 09:45:37 -0400
Subject: [PATCH 08/65] Add support for removing corrupted cache entries in
 `tools vm sync-cache`

---
 tools/vm.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/tools/vm.py b/tools/vm.py
index f35102ad01b..f0a8cb34450 100644
--- a/tools/vm.py
+++ b/tools/vm.py
@@ -592,9 +592,19 @@ def sync_cache(
     cached_instances = {}
     if STATE_DIR.exists():
         for state_path in STATE_DIR.iterdir():
-            instance_id_path = state_path / "instance-id"
-            if instance_id_path.exists():
-                instance_id = instance_id_path.read_text()
+            try:
+                instance_id = (state_path / "instance-id").read_text()
+            except FileNotFoundError:
+                if not delete:
+                    log.info(
+                        f"Would remove {state_path.name} (No valid ID) from cache at {state_path}"
+                    )
+                else:
+                    shutil.rmtree(state_path)
+                    log.info(
+                        f"REMOVED {state_path.name} (No valid ID) from cache at {state_path}"
+                    )
+            else:
                 cached_instances[instance_id] = state_path.name
 
     # Find what instances we are missing in our cached states

From 4582cdce61079387aafe6584dfbd363ad7e83971 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Wed, 19 Jul 2023 11:13:28 -0400
Subject: [PATCH 09/65] Remove hash fields, they are unused

---
 pkg/tests/support/helpers.py | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py
index f27d2400d81..9f1326acf09 100644
--- a/pkg/tests/support/helpers.py
+++ b/pkg/tests/support/helpers.py
@@ -66,7 +66,6 @@ class SaltPkgInstall:
     onedir: bool = attr.ib(default=False)
     singlebin: bool = attr.ib(default=False)
     compressed: bool = attr.ib(default=False)
-    hashes: Dict[str, Dict[str, Any]] = attr.ib(repr=False)
     root: pathlib.Path = attr.ib(default=None)
     run_root: pathlib.Path = attr.ib(default=None)
     ssm_bin: pathlib.Path = attr.ib(default=None)
@@ -75,8 +74,8 @@ class SaltPkgInstall:
     installer_pkg: bool = attr.ib(default=False)
     upgrade: bool = attr.ib(default=False)
     downgrade: bool = attr.ib(default=False)
-    # install salt or not. This allows someone
-    # to test a currently installed version of salt
+
+    # Installing flags
     no_install: bool = attr.ib(default=False)
     no_uninstall: bool = attr.ib(default=False)
 
@@ -103,14 +102,6 @@ class SaltPkgInstall:
     def _default_proc(self):
         return Subprocess()
 
-    @hashes.default
-    def _default_hashes(self):
-        return {
-            "BLAKE2B": {"file": None, "tool": "-blake2b512"},
-            "SHA3_512": {"file": None, "tool": "-sha3-512"},
-            "SHA512": {"file": None, "tool": "-sha512"},
-        }
-
     @distro_id.default
     def _default_distro_id(self):
         return distro.id().lower()
@@ -480,16 +471,6 @@ class SaltPkgInstall:
         assert ret.returncode == 0
         return True
 
-    @property
-    def salt_hashes(self):
-        for _hash in self.hashes.keys():
-            for fpath in ARTIFACTS_DIR.glob(f"**/*{_hash}*"):
-                fpath = str(fpath)
-                if re.search(f"{_hash}", fpath):
-                    self.hashes[_hash]["file"] = fpath
-
-        return self.hashes
-
     def _install_ssm_service(self):
         # Register the services
         # run_root and ssm_bin are configured in helper.py to point to the

From 9e302736e819d37d0fe574257152d13b8dc7d021 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Wed, 19 Jul 2023 12:20:33 -0400
Subject: [PATCH 10/65] Don't worry about the pkg_version, that is not of
 concern for us

---
 pkg/tests/support/helpers.py | 49 ++++++------------------------------
 1 file changed, 7 insertions(+), 42 deletions(-)

diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py
index 9f1326acf09..6a56631cdce 100644
--- a/pkg/tests/support/helpers.py
+++ b/pkg/tests/support/helpers.py
@@ -90,7 +90,6 @@ class SaltPkgInstall:
     binary_paths: Dict[str, List[pathlib.Path]] = attr.ib(init=False)
     classic: bool = attr.ib(default=False)
     prev_version: str = attr.ib()
-    pkg_version: str = attr.ib(default="1")
     repo_data: str = attr.ib(init=False, repr=False)
     major: str = attr.ib(init=False)
     minor: str = attr.ib(init=False)
@@ -220,14 +219,10 @@ class SaltPkgInstall:
 
     def get_version(self, version_only=False):
         """
-        Return the version information
-        needed to install a previous version
-        of Salt.
+        Return the version information needed to install a previous version of Salt.
         """
-        prev_version = self.prev_version
-        pkg_version = None
-        if not self.upgrade:
-            # working with local artifact
+        if not self.ugprade:
+            # Parse the version from a local artifact (regular or downgrade tests)
             version = ""
             for artifact in ARTIFACTS_DIR.glob("**/*.*"):
                 version = re.search(
@@ -237,43 +232,15 @@ class SaltPkgInstall:
                 if version:
                     version = version.groups()[0].replace("_", "-").replace("~", "")
                     version = version.split("-")[0]
-                    # TODO: Remove this clause.  This is to handle a versioning difficulty between pre-3006
-                    # dev versions and older salt versions on deb-based distros
-                    if version.startswith("1:"):
-                        version = version[2:]
                     break
             major, minor = version.split(".", 1)
         else:
-            if not prev_version:
-                # We did not pass in a version, lets detect the latest
-                # version information of a Salt artifact.
-                latest = list(self.repo_data["latest"].keys())[0]
-                version = self.repo_data["latest"][latest]["version"]
-                if "-" in version:
-                    prev_version, pkg_version = version.split("-")
-                else:
-                    prev_version, pkg_version = version, None
-            else:
-                # We passed in a version, but lets check if the pkg_version
-                # is defined. Relenv pkgs do not define a pkg build number
-                if "-" not in prev_version and not self.check_relenv(
-                    version=prev_version
-                ):
-                    pkg_numbers = [
-                        x for x in self.repo_data.keys() if prev_version in x
-                    ]
-                    pkg_version = 1
-                    for number in pkg_numbers:
-                        number = int(number.split("-")[1])
-                        if number > pkg_version:
-                            pkg_version = number
-            major, minor = prev_version.split(".")
-        if version_only:
-            return version
-        return major, minor, prev_version, pkg_version
+            # This is an upgrade, start on the previous version
+            major, minor = self.prev_version.split(".", 1)
+        return major, minor
 
     def __attrs_post_init__(self):
-        self.major, self.minor, self.prev_version, self.pkg_version = self.get_version()
+        self.major, self.minor = self.get_version()
         self.relenv = self.check_relenv(self.major)
         file_ext_re = r"tar\.gz"
         if platform.is_darwin():
@@ -648,8 +615,6 @@ class SaltPkgInstall:
         """
         major_ver = self.major
         minor_ver = self.minor
-        pkg_version = self.pkg_version
-        full_version = f"{self.major}.{self.minor}-{pkg_version}"
         relenv = int(major_ver) >= 3006
 
         min_ver = f"{major_ver}"

From 3a7995634b942f2d817735b51bb6deb1ff815c86 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Wed, 19 Jul 2023 16:21:05 -0400
Subject: [PATCH 11/65] Slim down the package test suite helpers a little,
 there were some unneeded pieces

---
 pkg/tests/conftest.py                         |  10 -
 .../integration/test_enabled_disabled.py      |   3 -
 pkg/tests/integration/test_version.py         |  11 -
 pkg/tests/support/helpers.py                  | 409 ++++--------------
 4 files changed, 83 insertions(+), 350 deletions(-)

diff --git a/pkg/tests/conftest.py b/pkg/tests/conftest.py
index 66b5b637c20..e91ba50386d 100644
--- a/pkg/tests/conftest.py
+++ b/pkg/tests/conftest.py
@@ -369,12 +369,6 @@ def salt_master(salt_factories, install_salt, state_tree, pillar_tree):
                     assert _file.owner() == "salt"
                     assert _file.group() == "salt"
 
-    if (platform.is_windows() or platform.is_darwin()) and install_salt.singlebin:
-        start_timeout = 240
-        # For every minion started we have to accept it's key.
-        # On windows, using single binary, it has to decompress it and run the command. Too slow.
-        # So, just in this scenario, use open mode
-        config_overrides["open_mode"] = True
     master_script = False
     if platform.is_windows():
         if install_salt.classic:
@@ -446,8 +440,6 @@ def salt_minion(salt_factories, salt_master, install_salt):
     Start up a minion
     """
     start_timeout = None
-    if (platform.is_windows() or platform.is_darwin()) and install_salt.singlebin:
-        start_timeout = 240
     minion_id = random_string("minion-")
     # Since the daemons are "packaged" with tiamat, the salt plugins provided
     # by salt-factories won't be discovered. Provide the required `*_dirs` on
@@ -538,8 +530,6 @@ def salt_api(salt_master, install_salt, extras_pypath):
     """
     shutil.rmtree(str(extras_pypath), ignore_errors=True)
     start_timeout = None
-    if platform.is_windows() and install_salt.singlebin:
-        start_timeout = 240
     factory = salt_master.salt_api_daemon()
     with factory.started(start_timeout=start_timeout):
         yield factory
diff --git a/pkg/tests/integration/test_enabled_disabled.py b/pkg/tests/integration/test_enabled_disabled.py
index adb953a5dd5..81368ca45ca 100644
--- a/pkg/tests/integration/test_enabled_disabled.py
+++ b/pkg/tests/integration/test_enabled_disabled.py
@@ -8,9 +8,6 @@ def test_services(install_salt, salt_cli, salt_minion):
     """
     Check if Services are enabled/disabled
     """
-    if install_salt.compressed:
-        pytest.skip("Skip test on single binary and onedir package")
-
     if install_salt.distro_id in ("ubuntu", "debian"):
         services_enabled = ["salt-master", "salt-minion", "salt-syndic", "salt-api"]
         services_disabled = []
diff --git a/pkg/tests/integration/test_version.py b/pkg/tests/integration/test_version.py
index d79ebcd8dfc..27c8195d40b 100644
--- a/pkg/tests/integration/test_version.py
+++ b/pkg/tests/integration/test_version.py
@@ -52,12 +52,6 @@ def test_compare_versions(version, binary, install_salt):
     """
     Test compare versions
     """
-    if platform.is_windows() and install_salt.singlebin:
-        pytest.skip(
-            "Already tested in `test_salt_version`. No need to repeat for "
-            "Windows single binary installs."
-        )
-
     if binary in install_salt.binary_paths:
         ret = install_salt.proc.run(*install_salt.binary_paths[binary], "--version")
         ret.stdout.matcher.fnmatch_lines([f"*{version}*"])
@@ -93,11 +87,6 @@ def test_symlinks_created(version, symlink, install_salt):
     """
     Test symlinks created
     """
-    if not install_salt.installer_pkg:
-        pytest.skip(
-            "This test is for the installer package only (pkg). It does not "
-            "apply to the tarball"
-        )
     ret = install_salt.proc.run(pathlib.Path("/usr/local/sbin") / symlink, "--version")
     ret.stdout.matcher.fnmatch_lines([f"*{version}*"])
 
diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py
index 6a56631cdce..74b788e96d1 100644
--- a/pkg/tests/support/helpers.py
+++ b/pkg/tests/support/helpers.py
@@ -59,43 +59,46 @@ log = logging.getLogger(__name__)
 
 @attr.s(kw_only=True, slots=True)
 class SaltPkgInstall:
-    conf_dir: pathlib.Path = attr.ib()
-    system_service: bool = attr.ib(default=False)
     proc: Subprocess = attr.ib(init=False, repr=False)
-    pkgs: List[str] = attr.ib(factory=list)
-    onedir: bool = attr.ib(default=False)
-    singlebin: bool = attr.ib(default=False)
-    compressed: bool = attr.ib(default=False)
+    system_service: bool = attr.ib(default=False)
+
+    # Paths
     root: pathlib.Path = attr.ib(default=None)
     run_root: pathlib.Path = attr.ib(default=None)
     ssm_bin: pathlib.Path = attr.ib(default=None)
     bin_dir: pathlib.Path = attr.ib(default=None)
-    # The artifact is an installer (exe, msi, pkg, rpm, deb)
-    installer_pkg: bool = attr.ib(default=False)
+    install_dir: pathlib.Path = attr.ib(init=False)
+    binary_paths: Dict[str, List[pathlib.Path]] = attr.ib(init=False)
+    config_path: str = attr.ib(init=False)
+    conf_dir: pathlib.Path = attr.ib()
+
+    # Test selection flags
     upgrade: bool = attr.ib(default=False)
     downgrade: bool = attr.ib(default=False)
+    classic: bool = attr.ib(default=False)
 
     # Installing flags
     no_install: bool = attr.ib(default=False)
     no_uninstall: bool = attr.ib(default=False)
 
+    # Distribution/system information
     distro_id: str = attr.ib(init=False)
     distro_codename: str = attr.ib(init=False)
     distro_name: str = attr.ib(init=False)
     distro_version: str = attr.ib(init=False)
+
+    # Package (and management) metadata
     pkg_mngr: str = attr.ib(init=False)
     rm_pkg: str = attr.ib(init=False)
     salt_pkgs: List[str] = attr.ib(init=False)
-    install_dir: pathlib.Path = attr.ib(init=False)
-    binary_paths: Dict[str, List[pathlib.Path]] = attr.ib(init=False)
-    classic: bool = attr.ib(default=False)
+    pkgs: List[str] = attr.ib(factory=list)
+    file_ext: bool = attr.ib(default=None)
+    relenv: bool = attr.ib(default=True)
+
+    # Version information
     prev_version: str = attr.ib()
-    repo_data: str = attr.ib(init=False, repr=False)
     major: str = attr.ib(init=False)
     minor: str = attr.ib(init=False)
-    relenv: bool = attr.ib(default=True)
-    file_ext: bool = attr.ib(default=None)
-    config_path: str = attr.ib(init=False)
 
     @proc.default
     def _default_proc(self):
@@ -174,27 +177,6 @@ class SaltPkgInstall:
             config_path = pathlib.Path("/etc", "salt")
         return config_path
 
-    @repo_data.default
-    def _default_repo_data(self):
-        """
-        Query to see the published Salt artifacts
-        from repo.json
-        """
-        url = "https://repo.saltproject.io/salt/onedir/repo.json"
-        ret = requests.get(url)
-        data = ret.json()
-        return data
-
-    def check_relenv(self, version):
-        """
-        Detects if we are using relenv
-        onedir build
-        """
-        relenv = False
-        if packaging.version.parse(version) >= packaging.version.parse("3006.0"):
-            relenv = True
-        return relenv
-
     def update_process_path(self):
         # The installer updates the path for the system, but that doesn't
         # make it to this python session, so we need to update that
@@ -221,12 +203,12 @@ class SaltPkgInstall:
         """
         Return the version information needed to install a previous version of Salt.
         """
-        if not self.ugprade:
+        if not self.upgrade:
             # Parse the version from a local artifact (regular or downgrade tests)
             version = ""
             for artifact in ARTIFACTS_DIR.glob("**/*.*"):
                 version = re.search(
-                    r"([0-9].*)(\-[0-9].fc|\-[0-9].el|\+ds|\_all|\_any|\_amd64|\_arm64|\-[0-9].am|(\-[0-9]-[a-z]*-[a-z]*[0-9_]*.|\-[0-9]*.*)(tar.gz|tar.xz|zip|exe|msi|pkg|rpm|deb))",
+                    r"([0-9].*)(\-[0-9].fc|\-[0-9].el|\+ds|\_all|\_any|\_amd64|\_arm64|\-[0-9].am|(\-[0-9]-[a-z]*-[a-z]*[0-9_]*.|\-[0-9]*.*)(exe|msi|pkg|rpm|deb))",
                     artifact.name,
                 )
                 if version:
@@ -241,182 +223,72 @@ class SaltPkgInstall:
 
     def __attrs_post_init__(self):
         self.major, self.minor = self.get_version()
-        self.relenv = self.check_relenv(self.major)
-        file_ext_re = r"tar\.gz"
+        self.relenv = packaging.version.parse(self.major) >= packaging.version.parse(
+            "3006.0"
+        )
+
+        file_ext_re = "rpm|deb"
         if platform.is_darwin():
-            file_ext_re = r"tar\.gz|pkg"
+            file_ext_re = "pkg"
         if platform.is_windows():
-            file_ext_re = "zip|exe|msi"
+            file_ext_re = "exe|msi"
+
         for f_path in ARTIFACTS_DIR.glob("**/*.*"):
             f_path = str(f_path)
             if re.search(f"salt-(.*).({file_ext_re})$", f_path, re.IGNORECASE):
-                # Compressed can be zip, tar.gz, exe, or pkg. All others are
-                # deb and rpm
-                self.compressed = True
                 self.file_ext = os.path.splitext(f_path)[1].strip(".")
-                if self.file_ext == "gz":
-                    if f_path.endswith("tar.gz"):
-                        self.file_ext = "tar.gz"
                 self.pkgs.append(f_path)
                 if platform.is_windows():
                     self.root = pathlib.Path(os.getenv("LocalAppData")).resolve()
-                    if self.file_ext == "zip":
-                        with ZipFile(f_path, "r") as zip:
-                            first = zip.infolist()[0]
-                            if first.filename == "salt/ssm.exe":
-                                self.onedir = True
-                                self.bin_dir = self.root / "salt" / "salt"
-                                self.run_root = self.bin_dir / "salt.exe"
-                                self.ssm_bin = self.root / "salt" / "ssm.exe"
-                            elif first.filename == "salt.exe":
-                                self.singlebin = True
-                                self.run_root = self.root / "salt.exe"
-                                self.ssm_bin = self.root / "ssm.exe"
-                            else:
-                                log.error(
-                                    "Unexpected archive layout. First: %s",
-                                    first.filename,
-                                )
-                    elif self.file_ext in ["exe", "msi"]:
-                        self.compressed = False
-                        self.onedir = True
-                        self.installer_pkg = True
+                    if self.file_ext in ["exe", "msi"]:
                         self.root = self.install_dir.parent
                         self.bin_dir = self.install_dir
                         self.ssm_bin = self.install_dir / "ssm.exe"
                     else:
                         log.error("Unexpected file extension: %s", self.file_ext)
-                else:
-                    if platform.is_darwin():
-                        self.root = pathlib.Path(os.sep, "opt")
-                    else:
-                        self.root = pathlib.Path(os.sep, "usr", "local", "bin")
-
+                elif platform.is_darwin():
+                    self.root = pathlib.Path(os.sep, "opt")
                     if self.file_ext == "pkg":
-                        self.compressed = False
-                        self.onedir = True
-                        self.installer_pkg = True
                         self.bin_dir = self.root / "salt" / "bin"
                         self.run_root = self.bin_dir / "run"
-                    elif self.file_ext == "tar.gz":
-                        with tarfile.open(f_path) as tar:
-                            # The first item will be called salt
-                            first = next(iter(tar.getmembers()))
-                            if first.name == "salt" and first.isdir():
-                                self.onedir = True
-                                self.bin_dir = self.root / "salt" / "run"
-                                self.run_root = self.bin_dir / "run"
-                            elif first.name == "salt" and first.isfile():
-                                self.singlebin = True
-                                self.run_root = self.root / "salt"
-                            else:
-                                log.error(
-                                    "Unexpected archive layout. First: %s (isdir: %s, isfile: %s)",
-                                    first.name,
-                                    first.isdir(),
-                                    first.isfile(),
-                                )
                     else:
                         log.error("Unexpected file extension: %s", self.file_ext)
 
-            if re.search(
-                r"salt(.*)(x86_64|all|amd64|aarch64|arm64)\.(rpm|deb)$", f_path
-            ):
-                self.installer_pkg = True
-                self.pkgs.append(f_path)
-
         if not self.pkgs:
             pytest.fail("Could not find Salt Artifacts")
 
         python_bin = self.install_dir / "bin" / "python3"
         if platform.is_windows():
             python_bin = self.install_dir / "Scripts" / "python.exe"
-        if not self.compressed:
-            if platform.is_windows():
-                self.binary_paths = {
-                    "call": ["salt-call.exe"],
-                    "cp": ["salt-cp.exe"],
-                    "minion": ["salt-minion.exe"],
-                    "pip": ["salt-pip.exe"],
-                    "python": [python_bin],
-                }
-            else:
-                if os.path.exists(self.install_dir / "bin" / "salt"):
-                    install_dir = self.install_dir / "bin"
-                else:
-                    install_dir = self.install_dir
-                self.binary_paths = {
-                    "salt": [install_dir / "salt"],
-                    "api": [install_dir / "salt-api"],
-                    "call": [install_dir / "salt-call"],
-                    "cloud": [install_dir / "salt-cloud"],
-                    "cp": [install_dir / "salt-cp"],
-                    "key": [install_dir / "salt-key"],
-                    "master": [install_dir / "salt-master"],
-                    "minion": [install_dir / "salt-minion"],
-                    "proxy": [install_dir / "salt-proxy"],
-                    "run": [install_dir / "salt-run"],
-                    "ssh": [install_dir / "salt-ssh"],
-                    "syndic": [install_dir / "salt-syndic"],
-                    "spm": [install_dir / "spm"],
-                    "pip": [install_dir / "salt-pip"],
-                    "python": [python_bin],
-                }
+            self.binary_paths = {
+                "call": ["salt-call.exe"],
+                "cp": ["salt-cp.exe"],
+                "minion": ["salt-minion.exe"],
+                "pip": ["salt-pip.exe"],
+                "python": [python_bin],
+            }
         else:
-            if self.run_root and os.path.exists(self.run_root):
-                if platform.is_windows():
-                    self.binary_paths = {
-                        "call": [str(self.run_root), "call"],
-                        "cp": [str(self.run_root), "cp"],
-                        "minion": [str(self.run_root), "minion"],
-                        "pip": [str(self.run_root), "pip"],
-                        "python": [python_bin],
-                    }
-                else:
-                    self.binary_paths = {
-                        "salt": [str(self.run_root)],
-                        "api": [str(self.run_root), "api"],
-                        "call": [str(self.run_root), "call"],
-                        "cloud": [str(self.run_root), "cloud"],
-                        "cp": [str(self.run_root), "cp"],
-                        "key": [str(self.run_root), "key"],
-                        "master": [str(self.run_root), "master"],
-                        "minion": [str(self.run_root), "minion"],
-                        "proxy": [str(self.run_root), "proxy"],
-                        "run": [str(self.run_root), "run"],
-                        "ssh": [str(self.run_root), "ssh"],
-                        "syndic": [str(self.run_root), "syndic"],
-                        "spm": [str(self.run_root), "spm"],
-                        "pip": [str(self.run_root), "pip"],
-                        "python": [python_bin],
-                    }
+            if os.path.exists(self.install_dir / "bin" / "salt"):
+                install_dir = self.install_dir / "bin"
             else:
-                if platform.is_windows():
-                    self.binary_paths = {
-                        "call": [self.install_dir / "salt-call.exe"],
-                        "cp": [self.install_dir / "salt-cp.exe"],
-                        "minion": [self.install_dir / "salt-minion.exe"],
-                        "pip": [self.install_dir / "salt-pip.exe"],
-                        "python": [python_bin],
-                    }
-                else:
-                    self.binary_paths = {
-                        "salt": [self.install_dir / "salt"],
-                        "api": [self.install_dir / "salt-api"],
-                        "call": [self.install_dir / "salt-call"],
-                        "cloud": [self.install_dir / "salt-cloud"],
-                        "cp": [self.install_dir / "salt-cp"],
-                        "key": [self.install_dir / "salt-key"],
-                        "master": [self.install_dir / "salt-master"],
-                        "minion": [self.install_dir / "salt-minion"],
-                        "proxy": [self.install_dir / "salt-proxy"],
-                        "run": [self.install_dir / "salt-run"],
-                        "ssh": [self.install_dir / "salt-ssh"],
-                        "syndic": [self.install_dir / "salt-syndic"],
-                        "spm": [self.install_dir / "spm"],
-                        "pip": [self.install_dir / "salt-pip"],
-                        "python": [python_bin],
-                    }
+                install_dir = self.install_dir
+            self.binary_paths = {
+                "salt": [install_dir / "salt"],
+                "api": [install_dir / "salt-api"],
+                "call": [install_dir / "salt-call"],
+                "cloud": [install_dir / "salt-cloud"],
+                "cp": [install_dir / "salt-cp"],
+                "key": [install_dir / "salt-key"],
+                "master": [install_dir / "salt-master"],
+                "minion": [install_dir / "salt-minion"],
+                "proxy": [install_dir / "salt-proxy"],
+                "run": [install_dir / "salt-run"],
+                "ssh": [install_dir / "salt-ssh"],
+                "syndic": [install_dir / "salt-syndic"],
+                "spm": [install_dir / "spm"],
+                "pip": [install_dir / "salt-pip"],
+                "python": [python_bin],
+            }
 
     @staticmethod
     def salt_factories_root_dir(system_service: bool = False) -> pathlib.Path:
@@ -438,68 +310,6 @@ class SaltPkgInstall:
         assert ret.returncode == 0
         return True
 
-    def _install_ssm_service(self):
-        # Register the services
-        # run_root and ssm_bin are configured in helper.py to point to the
-        # correct binary location
-        log.debug("Installing master service")
-        ret = self.proc.run(
-            str(self.ssm_bin),
-            "install",
-            "salt-master",
-            str(self.run_root),
-            "master",
-            "-c",
-            str(self.conf_dir),
-        )
-        self._check_retcode(ret)
-        log.debug("Installing minion service")
-        ret = self.proc.run(
-            str(self.ssm_bin),
-            "install",
-            "salt-minion",
-            str(self.run_root),
-            "minion",
-            "-c",
-            str(self.conf_dir),
-        )
-        self._check_retcode(ret)
-        log.debug("Installing api service")
-        ret = self.proc.run(
-            str(self.ssm_bin),
-            "install",
-            "salt-api",
-            str(self.run_root),
-            "api",
-            "-c",
-            str(self.conf_dir),
-        )
-        self._check_retcode(ret)
-
-    def _install_compressed(self, upgrade=False):
-        pkg = self.pkgs[0]
-        log.info("Installing %s", pkg)
-        if platform.is_windows():
-            if pkg.endswith("zip"):
-                # Extract the files
-                log.debug("Extracting zip file")
-                with ZipFile(pkg, "r") as zip:
-                    zip.extractall(path=self.root)
-            elif pkg.endswith("exe") or pkg.endswith("msi"):
-                log.error("Not a compressed package type: %s", pkg)
-            else:
-                log.error("Unknown package type: %s", pkg)
-            if self.system_service:
-                self._install_ssm_service()
-        elif platform.is_darwin():
-            log.debug("Extracting tarball into %s", self.root)
-            with tarfile.open(pkg) as tar:  # , "r:gz")
-                tar.extractall(path=str(self.root))
-        else:
-            log.debug("Extracting tarball into %s", self.root)
-            with tarfile.open(pkg) as tar:  # , "r:gz")
-                tar.extractall(path=str(self.root))
-
     def _install_pkgs(self, upgrade=False):
         pkg = self.pkgs[0]
         if platform.is_windows():
@@ -583,12 +393,9 @@ class SaltPkgInstall:
         ).stdout
 
     def install(self, upgrade=False):
-        if self.compressed:
-            self._install_compressed(upgrade=upgrade)
-        else:
-            self._install_pkgs(upgrade=upgrade)
-            if self.distro_id in ("ubuntu", "debian"):
-                self.stop_services()
+        self._install_pkgs(upgrade=upgrade)
+        if self.distro_id in ("ubuntu", "debian"):
+            self.stop_services()
 
     def stop_services(self):
         """
@@ -614,10 +421,6 @@ class SaltPkgInstall:
         upgrade tests.
         """
         major_ver = self.major
-        minor_ver = self.minor
-        relenv = int(major_ver) >= 3006
-
-        min_ver = f"{major_ver}"
         distro_name = self.distro_name
         if distro_name == "centos" or distro_name == "fedora":
             distro_name = "redhat"
@@ -631,7 +434,7 @@ class SaltPkgInstall:
             gpg_key = "SALTSTACK-GPG-KEY.pub"
             if self.distro_version == "9":
                 gpg_key = "SALTSTACK-GPG-KEY2.pub"
-            if relenv:
+            if self.relenv:
                 gpg_key = "SALT-PROJECT-GPG-PUBKEY-2023.pub"
 
             if platform.is_aarch64():
@@ -673,7 +476,7 @@ class SaltPkgInstall:
             pathlib.Path("/etc/apt/keyrings").mkdir(parents=True, exist_ok=True)
             gpg_dest = "salt-archive-keyring.gpg"
             gpg_key = gpg_dest
-            if relenv:
+            if self.relenv:
                 gpg_key = "SALT-PROJECT-GPG-PUBKEY-2023.gpg"
 
             download_file(
@@ -698,16 +501,14 @@ class SaltPkgInstall:
             self._check_retcode(ret)
             self.stop_services()
         elif platform.is_windows():
-            self.onedir = True
-            self.installer_pkg = True
             self.bin_dir = self.install_dir / "bin"
             self.run_root = self.bin_dir / f"salt.exe"
             self.ssm_bin = self.bin_dir / "ssm.exe"
-            if self.file_ext == "msi" or relenv:
+            if self.file_ext == "msi" or self.relenv:
                 self.ssm_bin = self.install_dir / "ssm.exe"
 
             if not self.classic:
-                if not relenv:
+                if not self.relenv:
                     win_pkg = f"salt-{self.prev_version}-windows-amd64.{self.file_ext}"
                     win_pkg_url = f"https://repo.saltproject.io/salt/py3/windows/{self.prev_version}/{win_pkg}"
                 else:
@@ -720,9 +521,11 @@ class SaltPkgInstall:
                     win_pkg_url = f"https://repo.saltproject.io/salt/py3/windows/{major_ver}/{win_pkg}"
             else:
                 if self.file_ext == "msi":
-                    win_pkg = f"Salt-Minion-{min_ver}-1-Py3-AMD64.{self.file_ext}"
+                    win_pkg = f"Salt-Minion-{major_ver}-1-Py3-AMD64.{self.file_ext}"
                 elif self.file_ext == "exe":
-                    win_pkg = f"Salt-Minion-{min_ver}-1-Py3-AMD64-Setup.{self.file_ext}"
+                    win_pkg = (
+                        f"Salt-Minion-{major_ver}-1-Py3-AMD64-Setup.{self.file_ext}"
+                    )
                 win_pkg_url = f"https://repo.saltproject.io/windows/{win_pkg}"
             pkg_path = pathlib.Path(r"C:\TEMP", win_pkg)
             pkg_path.parent.mkdir(exist_ok=True)
@@ -755,7 +558,7 @@ class SaltPkgInstall:
                 mac_pkg = f"salt-{self.prev_version}-py3-x86_64.pkg"
                 mac_pkg_url = f"https://repo.saltproject.io/osx/{mac_pkg}"
             else:
-                if not relenv:
+                if not self.relenv:
                     mac_pkg = f"salt-{self.prev_version}-macos-x86_64.pkg"
                     mac_pkg_url = f"https://repo.saltproject.io/salt/py3/macos/{self.prev_version}/{mac_pkg}"
                 else:
@@ -772,26 +575,19 @@ class SaltPkgInstall:
             ret = self.proc.run("installer", "-pkg", mac_pkg_path, "-target", "/")
             self._check_retcode(ret)
 
-    def _uninstall_compressed(self):
+    def uninstall(self):
+        pkg = self.pkgs[0]
         if platform.is_windows():
-            if self.system_service:
-                # Uninstall the services
-                log.debug("Uninstalling master service")
-                self.proc.run(str(self.ssm_bin), "stop", "salt-master")
-                self.proc.run(str(self.ssm_bin), "remove", "salt-master", "confirm")
-                log.debug("Uninstalling minion service")
-                self.proc.run(str(self.ssm_bin), "stop", "salt-minion")
-                self.proc.run(str(self.ssm_bin), "remove", "salt-minion", "confirm")
-                log.debug("Uninstalling api service")
-                self.proc.run(str(self.ssm_bin), "stop", "salt-api")
-                self.proc.run(str(self.ssm_bin), "remove", "salt-api", "confirm")
-            log.debug("Removing the Salt Service Manager")
-            if self.ssm_bin:
-                try:
-                    self.ssm_bin.unlink()
-                except PermissionError:
-                    atexit.register(self.ssm_bin.unlink)
-        if platform.is_darwin():
+            log.info("Uninstalling %s", pkg)
+            if pkg.endswith("exe"):
+                uninst = self.install_dir / "uninst.exe"
+                ret = self.proc.run(uninst, "/S")
+                self._check_retcode(ret)
+            elif pkg.endswith("msi"):
+                ret = self.proc.run("msiexec.exe", "/qn", "/x", pkg)
+                self._check_retcode(ret)
+
+        elif platform.is_darwin():
             # From here: https://stackoverflow.com/a/46118276/4581998
             daemons_dir = pathlib.Path(os.sep, "Library", "LaunchDaemons")
             for service in ("minion", "master", "api", "syndic"):
@@ -837,42 +633,13 @@ class SaltPkgInstall:
             # Remove receipt
             self.proc.run("pkgutil", "--forget", "com.saltstack.salt")
 
-        if self.singlebin:
-            log.debug("Deleting the salt binary: %s", self.run_root)
-            if self.run_root:
-                try:
-                    self.run_root.unlink()
-                except PermissionError:
-                    atexit.register(self.run_root.unlink)
-        else:
             log.debug("Deleting the onedir directory: %s", self.root / "salt")
             shutil.rmtree(str(self.root / "salt"))
-
-    def _uninstall_pkgs(self):
-        pkg = self.pkgs[0]
-        if platform.is_windows():
-            log.info("Uninstalling %s", pkg)
-            if pkg.endswith("exe"):
-                uninst = self.install_dir / "uninst.exe"
-                ret = self.proc.run(uninst, "/S")
-                self._check_retcode(ret)
-            elif pkg.endswith("msi"):
-                ret = self.proc.run("msiexec.exe", "/qn", "/x", pkg)
-                self._check_retcode(ret)
-
-        elif platform.is_darwin():
-            self._uninstall_compressed()
         else:
             log.debug("Un-Installing packages:\n%s", pprint.pformat(self.salt_pkgs))
             ret = self.proc.run(self.pkg_mngr, self.rm_pkg, "-y", *self.salt_pkgs)
             self._check_retcode(ret)
 
-    def uninstall(self):
-        if self.compressed:
-            self._uninstall_compressed()
-        else:
-            self._uninstall_pkgs()
-
     def assert_uninstalled(self):
         """
         Assert that the paths in /opt/saltstack/ were correctly
@@ -1318,7 +1085,7 @@ class PkgMixin:
     salt_pkg_install: SaltPkgInstall = attr.ib()
 
     def get_script_path(self):
-        if self.salt_pkg_install.compressed or (
+        if (
             platform.is_darwin()
             and self.salt_pkg_install.classic
             and self.salt_pkg_install.upgrade
@@ -1335,21 +1102,11 @@ class PkgMixin:
 
     def get_base_script_args(self):
         base_script_args = []
-        if self.salt_pkg_install.run_root and os.path.exists(
-            self.salt_pkg_install.run_root
-        ):
-            if self.salt_pkg_install.compressed:
-                if self.script_name == "spm":
-                    base_script_args.append(self.script_name)
-                elif self.script_name != "salt":
-                    base_script_args.append(self.script_name.split("salt-")[-1])
         base_script_args.extend(super().get_base_script_args())
         return base_script_args
 
     def cmdline(self, *args, **kwargs):
         _cmdline = super().cmdline(*args, **kwargs)
-        if self.salt_pkg_install.compressed is False:
-            return _cmdline
         if _cmdline[0] == self.python_executable:
             _cmdline.pop(0)
         return _cmdline

From 253eb49eae58cc886f60341c64ec8dbd8d425957 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Mon, 31 Jul 2023 10:50:41 -0400
Subject: [PATCH 12/65] `Terminating`

---
 tools/vm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/vm.py b/tools/vm.py
index f0a8cb34450..9e0a71fa2b8 100644
--- a/tools/vm.py
+++ b/tools/vm.py
@@ -1204,7 +1204,7 @@ class VM:
             timeout = self.config.terminate_timeout
             timeout_progress = 0.0
             progress = create_progress_bar()
-            task = progress.add_task(f"Terminatting {self!r}...", total=timeout)
+            task = progress.add_task(f"Terminating {self!r}...", total=timeout)
             self.instance.terminate()
             try:
                 with progress:

From 8a0e2ec338ab08f41d658e6d8ddebba31c74ea5c Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Mon, 31 Jul 2023 17:44:17 -0400
Subject: [PATCH 13/65] Some more cleanup

---
 pkg/tests/conftest.py                  |  2 --
 pkg/tests/support/helpers.py           | 41 ++++----------------------
 pkg/tests/upgrade/test_salt_upgrade.py |  4 +--
 3 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/pkg/tests/conftest.py b/pkg/tests/conftest.py
index e91ba50386d..541cb6434a1 100644
--- a/pkg/tests/conftest.py
+++ b/pkg/tests/conftest.py
@@ -373,8 +373,6 @@ def salt_master(salt_factories, install_salt, state_tree, pillar_tree):
     if platform.is_windows():
         if install_salt.classic:
             master_script = True
-        # this check will need to be changed to install_salt.relenv
-        # once the package version returns 3006 and not 3005 on master
         if install_salt.relenv:
             master_script = True
         elif not install_salt.upgrade:
diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py
index 74b788e96d1..3669e38675c 100644
--- a/pkg/tests/support/helpers.py
+++ b/pkg/tests/support/helpers.py
@@ -6,11 +6,9 @@ import pathlib
 import pprint
 import re
 import shutil
-import tarfile
 import textwrap
 import time
-from typing import TYPE_CHECKING, Any, Dict, List
-from zipfile import ZipFile
+from typing import TYPE_CHECKING, Dict, List
 
 import attr
 import distro
@@ -30,12 +28,6 @@ from saltfactories.cli import call, key, salt
 from saltfactories.daemons import api, master, minion
 from saltfactories.utils import cli_scripts
 
-try:
-    import crypt
-
-    HAS_CRYPT = True
-except ImportError:
-    HAS_CRYPT = False
 try:
     import pwd
 
@@ -43,13 +35,6 @@ try:
 except ImportError:
     HAS_PWD = False
 
-try:
-    import winreg
-
-    HAS_WINREG = True
-except ImportError:
-    HAS_WINREG = False
-
 TESTS_DIR = pathlib.Path(__file__).resolve().parent.parent
 CODE_DIR = TESTS_DIR.parent
 ARTIFACTS_DIR = CODE_DIR / "artifacts"
@@ -182,23 +167,6 @@ class SaltPkgInstall:
         # make it to this python session, so we need to update that
         os.environ["PATH"] = ";".join([str(self.install_dir), os.getenv("path")])
 
-        # When the MSI installer is run from self.proc.run, it doesn't update
-        # the registry. When run from a normal command prompt it does. Until we
-        # figure that out, we will update the process path as above. This
-        # doesn't really check that the path is being set though... but I see
-        # no other way around this
-        # if HAS_WINREG:
-        #     log.debug("Refreshing the path")
-        #     # Get the updated system path from the registry
-        #     path_key = winreg.OpenKeyEx(
-        #         winreg.HKEY_LOCAL_MACHINE,
-        #         r"SYSTEM\CurrentControlSet\Control\Session Manager\Environment",
-        #     )
-        #     current_path = winreg.QueryValueEx(path_key, "path")[0]
-        #     path_key.Close()
-        #     # Update the path for the current running process
-        #     os.environ["PATH"] = current_path
-
     def get_version(self, version_only=False):
         """
         Return the version information needed to install a previous version of Salt.
@@ -219,6 +187,8 @@ class SaltPkgInstall:
         else:
             # This is an upgrade, start on the previous version
             major, minor = self.prev_version.split(".", 1)
+        if version_only:
+            return version
         return major, minor
 
     def __attrs_post_init__(self):
@@ -387,10 +357,10 @@ class SaltPkgInstall:
 
     def package_python_version(self):
         return self.proc.run(
-            self.binary_paths["python"],
+            str(self.binary_paths["python"][0]),
             "-c",
             "import sys; print('{}.{}'.format(*sys.version_info))",
-        ).stdout
+        ).stdout.strip()
 
     def install(self, upgrade=False):
         self._install_pkgs(upgrade=upgrade)
@@ -429,6 +399,7 @@ class SaltPkgInstall:
             root_url = "py3/"
 
         if self.distro_name in ["redhat", "centos", "amazon", "fedora", "vmware"]:
+            # Removing EPEL repo files
             for fp in pathlib.Path("/etc", "yum.repos.d").glob("epel*"):
                 fp.unlink()
             gpg_key = "SALTSTACK-GPG-KEY.pub"
diff --git a/pkg/tests/upgrade/test_salt_upgrade.py b/pkg/tests/upgrade/test_salt_upgrade.py
index cc0dec33fe4..ed905148430 100644
--- a/pkg/tests/upgrade/test_salt_upgrade.py
+++ b/pkg/tests/upgrade/test_salt_upgrade.py
@@ -26,15 +26,15 @@ def test_salt_upgrade(salt_call_cli, install_salt):
     assert "Authentication information could" in use_lib.stderr
 
     # Upgrade Salt from previous version and test
-    new_py_version = install_salt.package_python_version()
     install_salt.install(upgrade=True)
+    new_py_version = install_salt.package_python_version()
     ret = salt_call_cli.run("test.ping")
     assert ret.returncode == 0
     assert ret.data
 
     # Install dep following upgrade
     # TODO: This should be removed when we stop testing against versions < 3006.0
-    if not install_salt.relenv and original_py_version == new_py_version:
+    if not install_salt.relenv or original_py_version != new_py_version:
         install = salt_call_cli.run("--local", "pip.install", dep)
         assert install.returncode == 0
 

From 7e9dc8ca6360ab593ee5a9556fb8dd9f5e4c5698 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Mon, 31 Jul 2023 18:08:38 -0400
Subject: [PATCH 14/65] Start initial flow for downgrade tests

---
 .github/workflows/test-packages-action-macos.yml |  4 ++--
 .github/workflows/test-packages-action.yml       |  4 ++--
 noxfile.py                                       | 10 ++++++++++
 tools/ci.py                                      |  6 ++++--
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test-packages-action-macos.yml b/.github/workflows/test-packages-action-macos.yml
index f9b0fce96dc..f5e8add0e48 100644
--- a/.github/workflows/test-packages-action-macos.yml
+++ b/.github/workflows/test-packages-action-macos.yml
@@ -238,7 +238,7 @@ jobs:
           SKIP_INITIAL_GH_ACTIONS_FAILURES: "1"
         run: |
           sudo -E nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.test-chunk }} \
-          ${{ contains(matrix.test-chunk, 'upgrade') && format('--prev-version {0}', matrix.version) || ''}}
+          ${{ matrix.version && format('--prev-version {0}', matrix.version) || ''}}
 
       - name: Run Package Tests
         env:
@@ -252,7 +252,7 @@ jobs:
           COVERAGE_CONTEXT: ${{ inputs.distro-slug }}
         run: |
           sudo -E nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.test-chunk }} \
-          ${{ contains(matrix.test-chunk, 'upgrade') && format('--prev-version {0}', matrix.version) || ''}}
+          ${{ matrix.version && format('--prev-version {0}', matrix.version) || ''}}
 
       - name: Fix file ownership
         run: |
diff --git a/.github/workflows/test-packages-action.yml b/.github/workflows/test-packages-action.yml
index 59040dd7588..d8dc4815474 100644
--- a/.github/workflows/test-packages-action.yml
+++ b/.github/workflows/test-packages-action.yml
@@ -268,13 +268,13 @@ jobs:
         run: |
           tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \
             --nox-session=${{ inputs.nox-session }} ${{ inputs.distro-slug }} -- ${{ matrix.test-chunk }} \
-            ${{ contains(matrix.test-chunk, 'upgrade') && format('--prev-version {0}', matrix.version) || ''}}
+            ${{ matrix.version && format('--prev-version {0}', matrix.version) || ''}}
 
       - name: Run Package Tests
         run: |
           tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \
           --nox-session=${{ inputs.nox-session }} --rerun-failures ${{ inputs.distro-slug }} -- ${{ matrix.test-chunk }} \
-          ${{ contains(matrix.test-chunk, 'upgrade') && format('--prev-version {0}', matrix.version) || ''}}
+          ${{ matrix.version && format('--prev-version {0}', matrix.version) || ''}}
 
       - name: Download Test Run Artifacts
         id: download-artifacts-from-vm
diff --git a/noxfile.py b/noxfile.py
index 2016302c0fd..5874eca61c0 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -1797,6 +1797,16 @@ def test_pkgs_onedir(session):
             "--no-uninstall",
             "pkg/tests/upgrade/",
         ],
+        "downgrade": [
+            "--downgrade",
+            "--no-uninstall",
+            "pkg/tests/downgrade/",
+        ],
+        "downgrade-classic": [
+            "--downgrade",
+            "--no-uninstall",
+            "pkg/tests/downgrade/",
+        ],
         "download-pkgs": [
             "--download-pkgs",
             "pkg/tests/download/",
diff --git a/tools/ci.py b/tools/ci.py
index 08264bb4e50..0e29d9ad864 100644
--- a/tools/ci.py
+++ b/tools/ci.py
@@ -715,6 +715,7 @@ def pkg_matrix(
         # we allow for 3006.0 jobs to run, because then
         # we will have arm64 onedir packages to upgrade from
         sessions.append("upgrade")
+        sessions.append("downgrade")
     # TODO: Remove this block when we reach version 3009.0, we will no longer be testing upgrades from classic packages
     if (
         distro_slug
@@ -729,12 +730,13 @@ def pkg_matrix(
     ):
         # Packages for these OSs where never built for classic previously
         sessions.append("upgrade-classic")
+        sessions.append("downgrade-classic")
 
     for session in sessions:
         versions: list[str | None] = [None]
-        if session == "upgrade":
+        if session in ("upgrade", "downgrade"):
             versions = [str(version) for version in testing_releases]
-        elif session == "upgrade-classic":
+        elif session in ("upgrade-classic", "downgrade-classic"):
             versions = [
                 str(version)
                 for version in testing_releases

From b960cd4f2abe63139c62da95be16c81ce5b9260b Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Tue, 1 Aug 2023 09:27:45 -0400
Subject: [PATCH 15/65] Add back the crypt import

---
 pkg/tests/support/helpers.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py
index 3669e38675c..d4a52c24792 100644
--- a/pkg/tests/support/helpers.py
+++ b/pkg/tests/support/helpers.py
@@ -28,6 +28,12 @@ from saltfactories.cli import call, key, salt
 from saltfactories.daemons import api, master, minion
 from saltfactories.utils import cli_scripts
 
+try:
+    import crypt
+
+    HAS_CRYPT = True
+except ImportError:
+    HAS_CRYPT = False
 try:
     import pwd
 

From c914144f7d567aec31204e86fb648fc288911bb8 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Tue, 1 Aug 2023 09:52:24 -0400
Subject: [PATCH 16/65] Add downgrade tests directory

---
 pkg/tests/downgrade/__init__.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 pkg/tests/downgrade/__init__.py

diff --git a/pkg/tests/downgrade/__init__.py b/pkg/tests/downgrade/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d

From 1a5d1a0fc5351cd8443697afa6279f7464aef7ee Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Tue, 1 Aug 2023 09:54:25 -0400
Subject: [PATCH 17/65] Add `__init__.py`

---
 pkg/tests/upgrade/__init__.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 pkg/tests/upgrade/__init__.py

diff --git a/pkg/tests/upgrade/__init__.py b/pkg/tests/upgrade/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d

From d986874ab095aad26cd81c109cd8289db9f864f8 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Wed, 2 Aug 2023 17:33:37 -0400
Subject: [PATCH 18/65] Initial attempt at downgrades on RPMS and DEBS

---
 noxfile.py                                 |  3 +
 pkg/tests/conftest.py                      | 10 ++-
 pkg/tests/downgrade/test_salt_downgrade.py | 43 ++++++++++
 pkg/tests/support/helpers.py               | 92 +++++++++++++---------
 pkg/tests/upgrade/test_salt_upgrade.py     |  8 +-
 5 files changed, 112 insertions(+), 44 deletions(-)
 create mode 100644 pkg/tests/downgrade/test_salt_downgrade.py

diff --git a/noxfile.py b/noxfile.py
index 5874eca61c0..22e5e9aaafc 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -1865,6 +1865,7 @@ def test_pkgs_onedir(session):
         + session.posargs
     )
     _pytest(session, coverage=False, cmd_args=pytest_args, env=env)
+
     if chunk not in ("install", "download-pkgs"):
         cmd_args = chunks["install"]
         pytest_args = (
@@ -1878,5 +1879,7 @@ def test_pkgs_onedir(session):
             ]
             + session.posargs
         )
+        if "downgrade" in chunk:
+            pytest_args.append("--use-prev-version")
         _pytest(session, coverage=False, cmd_args=pytest_args, env=env)
     sys.exit(0)
diff --git a/pkg/tests/conftest.py b/pkg/tests/conftest.py
index 541cb6434a1..d6e0eff47f1 100644
--- a/pkg/tests/conftest.py
+++ b/pkg/tests/conftest.py
@@ -26,12 +26,12 @@ from tests.support.sminion import create_sminion
 log = logging.getLogger(__name__)
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture
 def version(install_salt):
     """
     get version number from artifact
     """
-    return install_salt.get_version(version_only=True)
+    return install_salt.version
 
 
 @pytest.fixture(scope="session")
@@ -116,6 +116,11 @@ def pytest_addoption(parser):
         action="store",
         help="Test an upgrade from the version specified.",
     )
+    test_selection_group.addoption(
+        "--use-prev-version",
+        action="store_true",
+        help="Tells the test suite to validate the version using the previous version (for downgrades)",
+    )
     test_selection_group.addoption(
         "--download-pkgs",
         default=False,
@@ -179,6 +184,7 @@ def install_salt(request, salt_factories_root_dir):
         no_install=request.config.getoption("--no-install"),
         classic=request.config.getoption("--classic"),
         prev_version=request.config.getoption("--prev-version"),
+        use_prev_version=request.config.getoption("--use_prev-version"),
     ) as fixture:
         yield fixture
 
diff --git a/pkg/tests/downgrade/test_salt_downgrade.py b/pkg/tests/downgrade/test_salt_downgrade.py
new file mode 100644
index 00000000000..8a2d39ce789
--- /dev/null
+++ b/pkg/tests/downgrade/test_salt_downgrade.py
@@ -0,0 +1,43 @@
+import pytest
+
+
+def test_salt_downgrade(salt_call_cli, install_salt):
+    """
+    Test an upgrade of Salt.
+    """
+    if not install_salt.downgrade:
+        pytest.skip("Not testing a downgrade, do not run")
+
+    original_py_version = install_salt.package_python_version()
+
+    # Verify current install version is setup correctly and works
+    ret = salt_call_cli.run("test.version")
+    assert ret.returncode == 0
+    assert ret.data == install_salt.artifact_version
+
+    # Test pip install before a downgrade
+    dep = "PyGithub==1.56.0"
+    install = salt_call_cli.run("--local", "pip.install", dep)
+    assert install.returncode == 0
+
+    # Verify we can use the module dependent on the installed package
+    repo = "https://github.com/saltstack/salt.git"
+    use_lib = salt_call_cli.run("--local", "github.get_repo_info", repo)
+    assert "Authentication information could" in use_lib.stderr
+
+    # Downgrade Salt to the previous version and test
+    install_salt.install(downgrade=True)
+    new_py_version = install_salt.package_python_version()
+    ret = salt_call_cli.run("test.version")
+    assert ret.returncode == 0
+    assert ret.data == install_salt.prev_version
+
+    # Install dep following downgrade
+    # TODO: This should be removed when we stop testing against versions < 3006.0
+    if not install_salt.relenv or original_py_version != new_py_version:
+        install = salt_call_cli.run("--local", "pip.install", dep)
+        assert install.returncode == 0
+
+    # test pip install after a downgrade
+    use_lib = salt_call_cli.run("--local", "github.get_repo_info", repo)
+    assert "Authentication information could" in use_lib.stderr
diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py
index d4a52c24792..458450a9f05 100644
--- a/pkg/tests/support/helpers.py
+++ b/pkg/tests/support/helpers.py
@@ -88,8 +88,9 @@ class SaltPkgInstall:
 
     # Version information
     prev_version: str = attr.ib()
-    major: str = attr.ib(init=False)
-    minor: str = attr.ib(init=False)
+    use_prev_version: str = attr.ib()
+    artifact_version: str = attr.ib(init=False)
+    version: str = attr.ib(init=False)
 
     @proc.default
     def _default_proc(self):
@@ -168,38 +169,41 @@ class SaltPkgInstall:
             config_path = pathlib.Path("/etc", "salt")
         return config_path
 
+    @version.default
+    def _default_version(self):
+        """
+        The version to be installed at the start
+        """
+        if not self.upgrade and not self.use_prev_version:
+            version = self.artifact_version
+        else:
+            version = self.prev_version
+        return version
+
+    @artifact_version.default
+    def _default_artifact_version(self):
+        """
+        The version of the local salt artifacts being tested, based on regex matching
+        """
+        version = ""
+        for artifact in ARTIFACTS_DIR.glob("**/*.*"):
+            version = re.search(
+                r"([0-9].*)(\-[0-9].fc|\-[0-9].el|\+ds|\_all|\_any|\_amd64|\_arm64|\-[0-9].am|(\-[0-9]-[a-z]*-[a-z]*[0-9_]*.|\-[0-9]*.*)(exe|msi|pkg|rpm|deb))",
+                artifact.name,
+            )
+            if version:
+                version = version.groups()[0].replace("_", "-").replace("~", "")
+                version = version.split("-")[0]
+                break
+        return version
+
     def update_process_path(self):
         # The installer updates the path for the system, but that doesn't
         # make it to this python session, so we need to update that
         os.environ["PATH"] = ";".join([str(self.install_dir), os.getenv("path")])
 
-    def get_version(self, version_only=False):
-        """
-        Return the version information needed to install a previous version of Salt.
-        """
-        if not self.upgrade:
-            # Parse the version from a local artifact (regular or downgrade tests)
-            version = ""
-            for artifact in ARTIFACTS_DIR.glob("**/*.*"):
-                version = re.search(
-                    r"([0-9].*)(\-[0-9].fc|\-[0-9].el|\+ds|\_all|\_any|\_amd64|\_arm64|\-[0-9].am|(\-[0-9]-[a-z]*-[a-z]*[0-9_]*.|\-[0-9]*.*)(exe|msi|pkg|rpm|deb))",
-                    artifact.name,
-                )
-                if version:
-                    version = version.groups()[0].replace("_", "-").replace("~", "")
-                    version = version.split("-")[0]
-                    break
-            major, minor = version.split(".", 1)
-        else:
-            # This is an upgrade, start on the previous version
-            major, minor = self.prev_version.split(".", 1)
-        if version_only:
-            return version
-        return major, minor
-
     def __attrs_post_init__(self):
-        self.major, self.minor = self.get_version()
-        self.relenv = packaging.version.parse(self.major) >= packaging.version.parse(
+        self.relenv = packaging.version.parse(self.version) >= packaging.version.parse(
             "3006.0"
         )
 
@@ -286,7 +290,10 @@ class SaltPkgInstall:
         assert ret.returncode == 0
         return True
 
-    def _install_pkgs(self, upgrade=False):
+    def _install_pkgs(self, upgrade=False, downgrade=False):
+        if downgrade:
+            self.install_previous(downgrade=downgrade)
+            return True
         pkg = self.pkgs[0]
         if platform.is_windows():
             if upgrade:
@@ -368,8 +375,8 @@ class SaltPkgInstall:
             "import sys; print('{}.{}'.format(*sys.version_info))",
         ).stdout.strip()
 
-    def install(self, upgrade=False):
-        self._install_pkgs(upgrade=upgrade)
+    def install(self, upgrade=False, downgrade=False):
+        self._install_pkgs(upgrade=upgrade, downgrade=downgrade)
         if self.distro_id in ("ubuntu", "debian"):
             self.stop_services()
 
@@ -391,12 +398,12 @@ class SaltPkgInstall:
             self._check_retcode(stop_service)
         return True
 
-    def install_previous(self):
+    def install_previous(self, downgrade=False):
         """
         Install previous version. This is used for
         upgrade tests.
         """
-        major_ver = self.major
+        major_ver = packaging.version.parse(self.prev_version).major
         distro_name = self.distro_name
         if distro_name == "centos" or distro_name == "fedora":
             distro_name = "redhat"
@@ -430,9 +437,10 @@ class SaltPkgInstall:
             )
             ret = self.proc.run(self.pkg_mngr, "clean", "expire-cache")
             self._check_retcode(ret)
+            cmd_action = "downgrade" if downgrade else "install"
             ret = self.proc.run(
                 self.pkg_mngr,
-                "install",
+                cmd_action,
                 *self.salt_pkgs,
                 "-y",
             )
@@ -444,7 +452,7 @@ class SaltPkgInstall:
             ret = self.proc.run(self.pkg_mngr, "install", "apt-transport-https", "-y")
             self._check_retcode(ret)
             ## only classic 3005 has arm64 support
-            if self.major >= "3006" and platform.is_aarch64():
+            if self.relenv and platform.is_aarch64():
                 arch = "arm64"
             elif platform.is_aarch64() and self.classic:
                 arch = "arm64"
@@ -469,12 +477,20 @@ class SaltPkgInstall:
                 )
             ret = self.proc.run(self.pkg_mngr, "update")
             self._check_retcode(ret)
-            ret = self.proc.run(
+            pkgs_to_install = self.salt_pkgs
+            if downgrade:
+                pkgs_to_install = [
+                    f"{pkg}={self.prev_version}" for pkg in self.salt_pkgs
+                ]
+            cmd = [
                 self.pkg_mngr,
                 "install",
-                *self.salt_pkgs,
+                *pkgs_to_install,
                 "-y",
-            )
+            ]
+            if downgrade:
+                cmd.append("--allow-downgrades")
+            ret = self.proc.run(*cmd)
             self._check_retcode(ret)
             self.stop_services()
         elif platform.is_windows():
diff --git a/pkg/tests/upgrade/test_salt_upgrade.py b/pkg/tests/upgrade/test_salt_upgrade.py
index ed905148430..3426fc65071 100644
--- a/pkg/tests/upgrade/test_salt_upgrade.py
+++ b/pkg/tests/upgrade/test_salt_upgrade.py
@@ -11,9 +11,9 @@ def test_salt_upgrade(salt_call_cli, install_salt):
     original_py_version = install_salt.package_python_version()
 
     # Verify previous install version is setup correctly and works
-    ret = salt_call_cli.run("test.ping")
+    ret = salt_call_cli.run("test.version")
     assert ret.returncode == 0
-    assert ret.data
+    assert ret.data == install_salt.prev_version
 
     # Test pip install before an upgrade
     dep = "PyGithub==1.56.0"
@@ -28,9 +28,9 @@ def test_salt_upgrade(salt_call_cli, install_salt):
     # Upgrade Salt from previous version and test
     install_salt.install(upgrade=True)
     new_py_version = install_salt.package_python_version()
-    ret = salt_call_cli.run("test.ping")
+    ret = salt_call_cli.run("test.version")
     assert ret.returncode == 0
-    assert ret.data
+    assert ret.data == install_salt.artifact_version
 
     # Install dep following upgrade
     # TODO: This should be removed when we stop testing against versions < 3006.0

From 7c9df30a8a287609813c29c6fe0d72194b5df811 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Thu, 3 Aug 2023 11:06:35 -0400
Subject: [PATCH 19/65] Fix `--use-prev-version` option

---
 pkg/tests/conftest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/tests/conftest.py b/pkg/tests/conftest.py
index d6e0eff47f1..d450bdf7eab 100644
--- a/pkg/tests/conftest.py
+++ b/pkg/tests/conftest.py
@@ -184,7 +184,7 @@ def install_salt(request, salt_factories_root_dir):
         no_install=request.config.getoption("--no-install"),
         classic=request.config.getoption("--classic"),
         prev_version=request.config.getoption("--prev-version"),
-        use_prev_version=request.config.getoption("--use_prev-version"),
+        use_prev_version=request.config.getoption("--use-prev-version"),
     ) as fixture:
         yield fixture
 

From abb8011fd414913889cad385721d424723105422 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Thu, 3 Aug 2023 17:02:44 -0400
Subject: [PATCH 20/65] Some more fixes for the debian downgrades, we are now
 using a pref file to force the downgrades without knowing the exact version

---
 noxfile.py                                 |  2 +-
 pkg/tests/downgrade/test_salt_downgrade.py | 10 +++++--
 pkg/tests/support/helpers.py               | 32 +++++++++++++++-------
 pkg/tests/upgrade/test_salt_upgrade.py     |  7 +++--
 4 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/noxfile.py b/noxfile.py
index 22e5e9aaafc..619b0ce28eb 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -1848,7 +1848,7 @@ def test_pkgs_onedir(session):
         "PKG_TEST_TYPE": chunk,
     }
 
-    if chunk == "upgrade-classic":
+    if chunk in ("upgrade-classic", "downgrade-classic"):
         cmd_args.append("--classic")
         # Workaround for installing and running classic packages from 3005.1
         # They can only run with importlib-metadata<5.0.0.
diff --git a/pkg/tests/downgrade/test_salt_downgrade.py b/pkg/tests/downgrade/test_salt_downgrade.py
index 8a2d39ce789..f0d8fff4391 100644
--- a/pkg/tests/downgrade/test_salt_downgrade.py
+++ b/pkg/tests/downgrade/test_salt_downgrade.py
@@ -8,7 +8,8 @@ def test_salt_downgrade(salt_call_cli, install_salt):
     if not install_salt.downgrade:
         pytest.skip("Not testing a downgrade, do not run")
 
-    original_py_version = install_salt.package_python_version()
+    if install_salt.relenv:
+        original_py_version = install_salt.package_python_version()
 
     # Verify current install version is setup correctly and works
     ret = salt_call_cli.run("test.version")
@@ -27,14 +28,17 @@ def test_salt_downgrade(salt_call_cli, install_salt):
 
     # Downgrade Salt to the previous version and test
     install_salt.install(downgrade=True)
-    new_py_version = install_salt.package_python_version()
+    if install_salt.relenv:
+        new_py_version = install_salt.package_python_version()
     ret = salt_call_cli.run("test.version")
     assert ret.returncode == 0
     assert ret.data == install_salt.prev_version
 
     # Install dep following downgrade
     # TODO: This should be removed when we stop testing against versions < 3006.0
-    if not install_salt.relenv or original_py_version != new_py_version:
+    if (
+        install_salt.relenv and original_py_version != new_py_version
+    ) or not install_salt.relenv:
         install = salt_call_cli.run("--local", "pip.install", dep)
         assert install.returncode == 0
 
diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py
index 458450a9f05..62a355210ab 100644
--- a/pkg/tests/support/helpers.py
+++ b/pkg/tests/support/helpers.py
@@ -404,6 +404,9 @@ class SaltPkgInstall:
         upgrade tests.
         """
         major_ver = packaging.version.parse(self.prev_version).major
+        relenv = packaging.version.parse(self.prev_version) >= packaging.version.parse(
+            "3006.0"
+        )
         distro_name = self.distro_name
         if distro_name == "centos" or distro_name == "fedora":
             distro_name = "redhat"
@@ -418,7 +421,7 @@ class SaltPkgInstall:
             gpg_key = "SALTSTACK-GPG-KEY.pub"
             if self.distro_version == "9":
                 gpg_key = "SALTSTACK-GPG-KEY2.pub"
-            if self.relenv:
+            if relenv:
                 gpg_key = "SALT-PROJECT-GPG-PUBKEY-2023.pub"
 
             if platform.is_aarch64():
@@ -452,7 +455,7 @@ class SaltPkgInstall:
             ret = self.proc.run(self.pkg_mngr, "install", "apt-transport-https", "-y")
             self._check_retcode(ret)
             ## only classic 3005 has arm64 support
-            if self.relenv and platform.is_aarch64():
+            if relenv and platform.is_aarch64():
                 arch = "arm64"
             elif platform.is_aarch64() and self.classic:
                 arch = "arm64"
@@ -461,7 +464,7 @@ class SaltPkgInstall:
             pathlib.Path("/etc/apt/keyrings").mkdir(parents=True, exist_ok=True)
             gpg_dest = "salt-archive-keyring.gpg"
             gpg_key = gpg_dest
-            if self.relenv:
+            if relenv:
                 gpg_key = "SALT-PROJECT-GPG-PUBKEY-2023.gpg"
 
             download_file(
@@ -478,30 +481,39 @@ class SaltPkgInstall:
             ret = self.proc.run(self.pkg_mngr, "update")
             self._check_retcode(ret)
             pkgs_to_install = self.salt_pkgs
-            if downgrade:
-                pkgs_to_install = [
-                    f"{pkg}={self.prev_version}" for pkg in self.salt_pkgs
-                ]
+
             cmd = [
                 self.pkg_mngr,
                 "install",
                 *pkgs_to_install,
                 "-y",
             ]
+
             if downgrade:
+                pref_file = pathlib.Path("/etc", "apt", "preferences.d", "salt.pref")
+                pref_file.parent.mkdir(exist_ok=True)
+                pref_contents = """
+                Package: salt*
+                Pin: origin "repo.saltproject.io"
+                Pin-Priority: 1001
+                """
+                with open(pref_file, "w") as fp:
+                    fp.write(pref_contents)
                 cmd.append("--allow-downgrades")
             ret = self.proc.run(*cmd)
             self._check_retcode(ret)
+            if downgrade:
+                pref_file.unlink()
             self.stop_services()
         elif platform.is_windows():
             self.bin_dir = self.install_dir / "bin"
             self.run_root = self.bin_dir / f"salt.exe"
             self.ssm_bin = self.bin_dir / "ssm.exe"
-            if self.file_ext == "msi" or self.relenv:
+            if self.file_ext == "msi" or relenv:
                 self.ssm_bin = self.install_dir / "ssm.exe"
 
             if not self.classic:
-                if not self.relenv:
+                if not relenv:
                     win_pkg = f"salt-{self.prev_version}-windows-amd64.{self.file_ext}"
                     win_pkg_url = f"https://repo.saltproject.io/salt/py3/windows/{self.prev_version}/{win_pkg}"
                 else:
@@ -551,7 +563,7 @@ class SaltPkgInstall:
                 mac_pkg = f"salt-{self.prev_version}-py3-x86_64.pkg"
                 mac_pkg_url = f"https://repo.saltproject.io/osx/{mac_pkg}"
             else:
-                if not self.relenv:
+                if not relenv:
                     mac_pkg = f"salt-{self.prev_version}-macos-x86_64.pkg"
                     mac_pkg_url = f"https://repo.saltproject.io/salt/py3/macos/{self.prev_version}/{mac_pkg}"
                 else:
diff --git a/pkg/tests/upgrade/test_salt_upgrade.py b/pkg/tests/upgrade/test_salt_upgrade.py
index 3426fc65071..7eb2de70d44 100644
--- a/pkg/tests/upgrade/test_salt_upgrade.py
+++ b/pkg/tests/upgrade/test_salt_upgrade.py
@@ -8,7 +8,8 @@ def test_salt_upgrade(salt_call_cli, install_salt):
     if not install_salt.upgrade:
         pytest.skip("Not testing an upgrade, do not run")
 
-    original_py_version = install_salt.package_python_version()
+    if install_salt.relenv:
+        original_py_version = install_salt.package_python_version()
 
     # Verify previous install version is setup correctly and works
     ret = salt_call_cli.run("test.version")
@@ -34,7 +35,9 @@ def test_salt_upgrade(salt_call_cli, install_salt):
 
     # Install dep following upgrade
     # TODO: This should be removed when we stop testing against versions < 3006.0
-    if not install_salt.relenv or original_py_version != new_py_version:
+    if (
+        install_salt.relenv and original_py_version != new_py_version
+    ) or not install_salt.relenv:
         install = salt_call_cli.run("--local", "pip.install", dep)
         assert install.returncode == 0
 

From f85c59af868a422deed0c6d2766cadc7432b0da7 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Fri, 4 Aug 2023 14:26:35 -0400
Subject: [PATCH 21/65] Change version checking

---
 pkg/tests/downgrade/test_salt_downgrade.py | 2 +-
 pkg/tests/support/helpers.py               | 6 ++++--
 pkg/tests/upgrade/test_salt_upgrade.py     | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkg/tests/downgrade/test_salt_downgrade.py b/pkg/tests/downgrade/test_salt_downgrade.py
index f0d8fff4391..8e16fcb8976 100644
--- a/pkg/tests/downgrade/test_salt_downgrade.py
+++ b/pkg/tests/downgrade/test_salt_downgrade.py
@@ -32,7 +32,7 @@ def test_salt_downgrade(salt_call_cli, install_salt):
         new_py_version = install_salt.package_python_version()
     ret = salt_call_cli.run("test.version")
     assert ret.returncode == 0
-    assert ret.data == install_salt.prev_version
+    assert ret.data < install_salt.artifact_version
 
     # Install dep following downgrade
     # TODO: This should be removed when we stop testing against versions < 3006.0
diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py
index 62a355210ab..5b5f6815e14 100644
--- a/pkg/tests/support/helpers.py
+++ b/pkg/tests/support/helpers.py
@@ -478,7 +478,6 @@ class SaltPkgInstall:
                     f"deb [signed-by=/etc/apt/keyrings/{gpg_dest} arch={arch}] "
                     f"https://repo.saltproject.io/{root_url}{distro_name}/{self.distro_version}/{arch}/{major_ver} {self.distro_codename} main"
                 )
-            ret = self.proc.run(self.pkg_mngr, "update")
             self._check_retcode(ret)
             pkgs_to_install = self.salt_pkgs
 
@@ -492,14 +491,17 @@ class SaltPkgInstall:
             if downgrade:
                 pref_file = pathlib.Path("/etc", "apt", "preferences.d", "salt.pref")
                 pref_file.parent.mkdir(exist_ok=True)
-                pref_contents = """
+                pref_contents = textwrap.dedent(
+                    """\
                 Package: salt*
                 Pin: origin "repo.saltproject.io"
                 Pin-Priority: 1001
                 """
+                )
                 with open(pref_file, "w") as fp:
                     fp.write(pref_contents)
                 cmd.append("--allow-downgrades")
+            ret = self.proc.run(self.pkg_mngr, "update")
             ret = self.proc.run(*cmd)
             self._check_retcode(ret)
             if downgrade:
diff --git a/pkg/tests/upgrade/test_salt_upgrade.py b/pkg/tests/upgrade/test_salt_upgrade.py
index 7eb2de70d44..cdfc9e484ab 100644
--- a/pkg/tests/upgrade/test_salt_upgrade.py
+++ b/pkg/tests/upgrade/test_salt_upgrade.py
@@ -14,7 +14,7 @@ def test_salt_upgrade(salt_call_cli, install_salt):
     # Verify previous install version is setup correctly and works
     ret = salt_call_cli.run("test.version")
     assert ret.returncode == 0
-    assert ret.data == install_salt.prev_version
+    assert ret.data < install_salt.artifact_version
 
     # Test pip install before an upgrade
     dep = "PyGithub==1.56.0"

From b3fcdf8bfd3801dfb9cc707a81cdc8227e4e8d77 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Mon, 7 Aug 2023 12:58:40 -0400
Subject: [PATCH 22/65] Move `/etc/salt/cloud` and `/etc/salt/roster` to
 `salt-cloud` and `salt-ssh` packages respectively

---
 pkg/debian/salt-cloud.install  | 1 +
 pkg/debian/salt-common.install | 2 --
 pkg/debian/salt-ssh.install    | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 pkg/debian/salt-cloud.install
 create mode 100644 pkg/debian/salt-ssh.install

diff --git a/pkg/debian/salt-cloud.install b/pkg/debian/salt-cloud.install
new file mode 100644
index 00000000000..b00b83321e1
--- /dev/null
+++ b/pkg/debian/salt-cloud.install
@@ -0,0 +1 @@
+conf/cloud /etc/salt
diff --git a/pkg/debian/salt-common.install b/pkg/debian/salt-common.install
index 0671a987c20..09bb9e28099 100644
--- a/pkg/debian/salt-common.install
+++ b/pkg/debian/salt-common.install
@@ -1,5 +1,3 @@
-conf/roster /etc/salt
-conf/cloud /etc/salt
 pkg/common/salt-common.logrotate /etc/logrotate.d/salt
 pkg/common/fish-completions/salt-cp.fish /usr/share/fish/vendor_completions.d
 pkg/common/fish-completions/salt-call.fish /usr/share/fish/vendor_completions.d
diff --git a/pkg/debian/salt-ssh.install b/pkg/debian/salt-ssh.install
new file mode 100644
index 00000000000..b2e2e88243b
--- /dev/null
+++ b/pkg/debian/salt-ssh.install
@@ -0,0 +1 @@
+conf/roster /etc/salt

From 6e5dc3cd87c4cdee7fa3eddd74d381e45a1c3588 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Mon, 7 Aug 2023 19:39:57 -0400
Subject: [PATCH 23/65] Fix assert and remove unneeded assignment

---
 pkg/tests/support/helpers.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py
index 5b5f6815e14..d81c982e4d1 100644
--- a/pkg/tests/support/helpers.py
+++ b/pkg/tests/support/helpers.py
@@ -363,7 +363,7 @@ class SaltPkgInstall:
             ret = self.proc.run(self.pkg_mngr, "install", "-y", *self.pkgs)
         if not platform.is_darwin() and not platform.is_windows():
             # Make sure we don't have any trailing references to old package file locations
-            ret.returncode == 0
+            assert ret.returncode == 0
             assert "/saltstack/salt/run" not in ret.stdout
         log.info(ret)
         self._check_retcode(ret)
@@ -479,12 +479,11 @@ class SaltPkgInstall:
                     f"https://repo.saltproject.io/{root_url}{distro_name}/{self.distro_version}/{arch}/{major_ver} {self.distro_codename} main"
                 )
             self._check_retcode(ret)
-            pkgs_to_install = self.salt_pkgs
 
             cmd = [
                 self.pkg_mngr,
                 "install",
-                *pkgs_to_install,
+                *self.salt_pkgs,
                 "-y",
             ]
 

From ad93c28386c7aa5d3c24f7880a3719961e53e835 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Tue, 8 Aug 2023 17:04:47 -0400
Subject: [PATCH 24/65] Finally fix the debian downgrade tests, and hopefully
 fix the 3006.1 upgrades

---
 noxfile.py                                    |  2 +
 pkg/debian/control                            |  4 +-
 pkg/tests/downgrade/test_salt_downgrade.py    | 30 +++---
 .../integration/test_clean_zmq_teardown.py    |  6 ++
 pkg/tests/integration/test_help.py            |  5 +
 pkg/tests/integration/test_pip.py             | 18 +++-
 pkg/tests/integration/test_python.py          | 22 +++--
 pkg/tests/integration/test_salt_user.py       |  6 ++
 pkg/tests/integration/test_version.py         |  2 +
 pkg/tests/support/helpers.py                  | 99 ++++++++++++++-----
 pkg/tests/upgrade/test_salt_upgrade.py        | 17 +---
 11 files changed, 143 insertions(+), 68 deletions(-)

diff --git a/noxfile.py b/noxfile.py
index 619b0ce28eb..bb0cc589f88 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -1881,5 +1881,7 @@ def test_pkgs_onedir(session):
         )
         if "downgrade" in chunk:
             pytest_args.append("--use-prev-version")
+        if chunk in ("upgrade-classic", "downgrade-classic"):
+            pytest_args.append("--classic")
         _pytest(session, coverage=False, cmd_args=pytest_args, env=env)
     sys.exit(0)
diff --git a/pkg/debian/control b/pkg/debian/control
index f4408d28116..511850c4769 100644
--- a/pkg/debian/control
+++ b/pkg/debian/control
@@ -77,8 +77,8 @@ Description: remote manager to administer servers via salt
 
 Package: salt-minion
 Architecture: amd64 arm64
-Replaces: salt-common (<< 3006.1)
-Breaks: salt-common (<< 3006.1)
+Replaces: salt-common (<< 3006.1~)
+Breaks: salt-common (<< 3006.1~)
 Depends: bsdmainutils,
          dctrl-tools,
          salt-common (= ${source:Version}),
diff --git a/pkg/tests/downgrade/test_salt_downgrade.py b/pkg/tests/downgrade/test_salt_downgrade.py
index 8e16fcb8976..dd95e8c00cb 100644
--- a/pkg/tests/downgrade/test_salt_downgrade.py
+++ b/pkg/tests/downgrade/test_salt_downgrade.py
@@ -1,4 +1,5 @@
 import pytest
+from packaging.version import parse
 
 
 def test_salt_downgrade(salt_call_cli, install_salt):
@@ -8,13 +9,15 @@ def test_salt_downgrade(salt_call_cli, install_salt):
     if not install_salt.downgrade:
         pytest.skip("Not testing a downgrade, do not run")
 
-    if install_salt.relenv:
+    is_downgrade_to_relenv = parse(install_salt.prev_version) >= parse("3006.0")
+
+    if is_downgrade_to_relenv:
         original_py_version = install_salt.package_python_version()
 
     # Verify current install version is setup correctly and works
     ret = salt_call_cli.run("test.version")
     assert ret.returncode == 0
-    assert ret.data == install_salt.artifact_version
+    assert parse(ret.data) == parse(install_salt.artifact_version)
 
     # Test pip install before a downgrade
     dep = "PyGithub==1.56.0"
@@ -28,20 +31,13 @@ def test_salt_downgrade(salt_call_cli, install_salt):
 
     # Downgrade Salt to the previous version and test
     install_salt.install(downgrade=True)
-    if install_salt.relenv:
-        new_py_version = install_salt.package_python_version()
-    ret = salt_call_cli.run("test.version")
+    ret = install_salt.proc.run("salt", "--version")
     assert ret.returncode == 0
-    assert ret.data < install_salt.artifact_version
+    assert parse(ret.stdout.strip().split()[-1]) < parse(install_salt.artifact_version)
 
-    # Install dep following downgrade
-    # TODO: This should be removed when we stop testing against versions < 3006.0
-    if (
-        install_salt.relenv and original_py_version != new_py_version
-    ) or not install_salt.relenv:
-        install = salt_call_cli.run("--local", "pip.install", dep)
-        assert install.returncode == 0
-
-    # test pip install after a downgrade
-    use_lib = salt_call_cli.run("--local", "github.get_repo_info", repo)
-    assert "Authentication information could" in use_lib.stderr
+    if is_downgrade_to_relenv:
+        new_py_version = install_salt.package_python_version()
+        if new_py_version == original_py_version:
+            # test pip install after a downgrade
+            use_lib = salt_call_cli.run("--local", "github.get_repo_info", repo)
+            assert "Authentication information could" in use_lib.stderr
diff --git a/pkg/tests/integration/test_clean_zmq_teardown.py b/pkg/tests/integration/test_clean_zmq_teardown.py
index d1dbe325ab2..b85897ac5d5 100644
--- a/pkg/tests/integration/test_clean_zmq_teardown.py
+++ b/pkg/tests/integration/test_clean_zmq_teardown.py
@@ -12,6 +12,12 @@ pytestmark = [
 log = logging.getLogger(__name__)
 
 
+@pytest.fixture(autouse=True)
+def skip_on_non_relenv(install_salt):
+    if not install_salt.relenv:
+        pytest.skip("This test is for relenv versions of salt")
+
+
 def test_check_no_import_error(salt_call_cli, salt_master):
     """
     Test that we don't have any errors on teardown of python when using a py-rendered sls file
diff --git a/pkg/tests/integration/test_help.py b/pkg/tests/integration/test_help.py
index 2f701c62494..1285c8a6aea 100644
--- a/pkg/tests/integration/test_help.py
+++ b/pkg/tests/integration/test_help.py
@@ -5,6 +5,11 @@ def test_help(install_salt):
     for cmd in install_salt.binary_paths.values():
         # TODO: add back salt-cloud and salt-ssh when its fixed
         cmd = [str(x) for x in cmd]
+
+        if len(cmd) > 1 and "shell" in cmd[1]:
+            # Singlebin build, unable to get the version
+            continue
+
         if "python" in cmd[0]:
             ret = install_salt.proc.run(*cmd, "--version")
             assert "Python" in ret.stdout
diff --git a/pkg/tests/integration/test_pip.py b/pkg/tests/integration/test_pip.py
index eb4b5c4896e..c930dc6c576 100644
--- a/pkg/tests/integration/test_pip.py
+++ b/pkg/tests/integration/test_pip.py
@@ -15,7 +15,7 @@ def pypath():
     elif platform.is_darwin():
         return pathlib.Path("/opt", "salt", "bin")
     else:
-        return pathlib.Path("/opt", "saltstack", "salt", "bin")
+        return pathlib.Path("/opt", "saltstack", "salt", "pypath", "bin")
 
 
 @pytest.fixture(autouse=True)
@@ -44,7 +44,7 @@ def wipe_pydeps(shell, install_salt, extras_pypath):
             shutil.rmtree(dirname, ignore_errors=True)
 
 
-def test_pip_install(salt_call_cli):
+def test_pip_install(salt_call_cli, install_salt):
     """
     Test pip.install and ensure module can use installed library
     """
@@ -68,6 +68,8 @@ def test_pip_install_extras(shell, install_salt, extras_pypath_bin):
     """
     Test salt-pip installs into the correct directory
     """
+    if not install_salt.relenv:
+        pytest.skip("The extras directory is only in relenv versions")
     dep = "pep8"
     extras_keyword = "extras-3"
     if platform.is_windows():
@@ -86,7 +88,7 @@ def test_pip_install_extras(shell, install_salt, extras_pypath_bin):
             break
     else:
         pytest.fail(
-            f"The {dep!r} package was not found installed. Packages Installed: {pkgs_installed}"
+            f"The {dep!r} package was not found installed. Packages Installed: {ret.data}"
         )
 
     show_ret = shell.run(*(install_salt.binary_paths["pip"] + ["show", dep]))
@@ -109,8 +111,12 @@ def demote(user_uid, user_gid):
 
 
 @pytest.mark.skip_on_windows(reason="We can't easily demote users on Windows")
-def test_pip_non_root(shell, install_salt, test_account, extras_pypath_bin):
+def test_pip_non_root(shell, install_salt, test_account, extras_pypath_bin, pypath):
+    if install_salt.classic:
+        pytest.skip("We can install non-root for classic packages")
     check_path = extras_pypath_bin / "pep8"
+    if not install_salt.relenv and not install_salt.classic:
+        check_path = pypath / "pep8"
     # We should be able to issue a --help without being root
     ret = subprocess.run(
         install_salt.binary_paths["salt"] + ["--help"],
@@ -154,7 +160,7 @@ def test_pip_non_root(shell, install_salt, test_account, extras_pypath_bin):
         universal_newlines=True,
     )
 
-    assert check_path.exists()
+    assert check_path.exists(), shutil.which("pep8")
 
     assert ret.returncode == 0, ret.stderr
 
@@ -164,6 +170,8 @@ def test_pip_install_salt_extension_in_extras(install_salt, extras_pypath, shell
     Test salt-pip installs into the correct directory and the salt extension
     is properly loaded.
     """
+    if not install_salt.relenv:
+        pytest.skip("The extras directory is only in relenv versions")
     dep = "salt-analytics-framework"
     dep_version = "0.1.0"
 
diff --git a/pkg/tests/integration/test_python.py b/pkg/tests/integration/test_python.py
index e6ed5c2c34f..a7271994a85 100644
--- a/pkg/tests/integration/test_python.py
+++ b/pkg/tests/integration/test_python.py
@@ -5,11 +5,18 @@ import pytest
 from tests.support.helpers import TESTS_DIR
 
 
+@pytest.fixture
+def python_script_bin(install_salt):
+    # Tiamat builds run scripts via `salt python`
+    if not install_salt.relenv and not install_salt.classic:
+        return install_salt.binary_paths["python"][:1] + ["python"]
+    return install_salt.binary_paths["python"]
+
+
 @pytest.mark.parametrize("exp_ret,user_arg", [(1, "false"), (0, "true")])
-def test_python_script(install_salt, exp_ret, user_arg):
-    ret = subprocess.run(
-        install_salt.binary_paths["python"]
-        + [str(TESTS_DIR / "files" / "check_python.py"), user_arg],
+def test_python_script(install_salt, exp_ret, user_arg, python_script_bin):
+    ret = install_salt.proc.run(
+        *(python_script_bin + [str(TESTS_DIR / "files" / "check_python.py"), user_arg]),
         stdout=subprocess.PIPE,
         stderr=subprocess.PIPE,
         check=False,
@@ -19,10 +26,9 @@ def test_python_script(install_salt, exp_ret, user_arg):
     assert ret.returncode == exp_ret, ret.stderr
 
 
-def test_python_script_exception(install_salt):
-    ret = subprocess.run(
-        install_salt.binary_paths["python"]
-        + [str(TESTS_DIR / "files" / "check_python.py"), "raise"],
+def test_python_script_exception(install_salt, python_script_bin):
+    ret = install_salt.proc.run(
+        *(python_script_bin + [str(TESTS_DIR / "files" / "check_python.py"), "raise"]),
         stdout=subprocess.PIPE,
         stderr=subprocess.PIPE,
         check=False,
diff --git a/pkg/tests/integration/test_salt_user.py b/pkg/tests/integration/test_salt_user.py
index 5e1ee05e70d..3b5e8e098e4 100644
--- a/pkg/tests/integration/test_salt_user.py
+++ b/pkg/tests/integration/test_salt_user.py
@@ -61,6 +61,12 @@ def pkg_paths_salt_user_exclusions():
     return paths
 
 
+@pytest.fixture(autouse=True)
+def skip_on_non_relenv(install_salt):
+    if not install_salt.relenv:
+        pytest.skip("The salt user only exists on relenv versions of salt")
+
+
 def test_salt_user_master(salt_master, install_salt):
     """
     Test the correct user is running the Salt Master
diff --git a/pkg/tests/integration/test_version.py b/pkg/tests/integration/test_version.py
index 27c8195d40b..730bf5b3b9a 100644
--- a/pkg/tests/integration/test_version.py
+++ b/pkg/tests/integration/test_version.py
@@ -23,6 +23,8 @@ def test_salt_versions_report_master(install_salt):
     """
     Test running --versions-report on master
     """
+    if not install_salt.relenv and not install_salt.classic:
+        pytest.skip("Unable to get the python version dynamically from tiamat builds")
     test_bin = os.path.join(*install_salt.binary_paths["master"])
     python_bin = os.path.join(*install_salt.binary_paths["python"])
     ret = install_salt.proc.run(test_bin, "--versions-report")
diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py
index d81c982e4d1..459c13d78ef 100644
--- a/pkg/tests/support/helpers.py
+++ b/pkg/tests/support/helpers.py
@@ -178,6 +178,10 @@ class SaltPkgInstall:
             version = self.artifact_version
         else:
             version = self.prev_version
+            parsed = packaging.version.parse(version)
+            version = f"{parsed.major}.{parsed.minor}"
+        if self.distro_id in ("ubuntu", "debian"):
+            self.stop_services()
         return version
 
     @artifact_version.default
@@ -252,23 +256,49 @@ class SaltPkgInstall:
                 install_dir = self.install_dir / "bin"
             else:
                 install_dir = self.install_dir
-            self.binary_paths = {
-                "salt": [install_dir / "salt"],
-                "api": [install_dir / "salt-api"],
-                "call": [install_dir / "salt-call"],
-                "cloud": [install_dir / "salt-cloud"],
-                "cp": [install_dir / "salt-cp"],
-                "key": [install_dir / "salt-key"],
-                "master": [install_dir / "salt-master"],
-                "minion": [install_dir / "salt-minion"],
-                "proxy": [install_dir / "salt-proxy"],
-                "run": [install_dir / "salt-run"],
-                "ssh": [install_dir / "salt-ssh"],
-                "syndic": [install_dir / "salt-syndic"],
-                "spm": [install_dir / "spm"],
-                "pip": [install_dir / "salt-pip"],
-                "python": [python_bin],
-            }
+            if self.relenv:
+                self.binary_paths = {
+                    "salt": [install_dir / "salt"],
+                    "api": [install_dir / "salt-api"],
+                    "call": [install_dir / "salt-call"],
+                    "cloud": [install_dir / "salt-cloud"],
+                    "cp": [install_dir / "salt-cp"],
+                    "key": [install_dir / "salt-key"],
+                    "master": [install_dir / "salt-master"],
+                    "minion": [install_dir / "salt-minion"],
+                    "proxy": [install_dir / "salt-proxy"],
+                    "run": [install_dir / "salt-run"],
+                    "ssh": [install_dir / "salt-ssh"],
+                    "syndic": [install_dir / "salt-syndic"],
+                    "spm": [install_dir / "spm"],
+                    "pip": [install_dir / "salt-pip"],
+                    "python": [python_bin],
+                }
+            else:
+                self.binary_paths = {
+                    "salt": [shutil.which("salt")],
+                    "api": [shutil.which("salt-api")],
+                    "call": [shutil.which("salt-call")],
+                    "cloud": [shutil.which("salt-cloud")],
+                    "cp": [shutil.which("salt-cp")],
+                    "key": [shutil.which("salt-key")],
+                    "master": [shutil.which("salt-master")],
+                    "minion": [shutil.which("salt-minion")],
+                    "proxy": [shutil.which("salt-proxy")],
+                    "run": [shutil.which("salt-run")],
+                    "ssh": [shutil.which("salt-ssh")],
+                    "syndic": [shutil.which("salt-syndic")],
+                    "spm": [shutil.which("spm")],
+                    "python": [str(pathlib.Path("/usr/bin/python3"))],
+                }
+                if self.classic:
+                    self.binary_paths["pip"] = [str(pathlib.Path("/usr/bin/pip3"))]
+                    self.proc.run(
+                        *self.binary_paths["pip"], "install", "-U", "pyopenssl"
+                    )
+                else:
+                    self.binary_paths["python"] = [shutil.which("salt"), "shell"]
+                    self.binary_paths["pip"] = [shutil.which("salt-pip")]
 
     @staticmethod
     def salt_factories_root_dir(system_service: bool = False) -> pathlib.Path:
@@ -387,16 +417,18 @@ class SaltPkgInstall:
         settings we have set. This will also verify the expected
         services are up and running.
         """
+        retval = True
         for service in ["salt-syndic", "salt-master", "salt-minion"]:
             check_run = self.proc.run("systemctl", "status", service)
             if check_run.returncode != 0:
                 # The system was not started automatically and we
                 # are expecting it to be on install
                 log.debug("The service %s was not started on install.", service)
-                return False
-            stop_service = self.proc.run("systemctl", "stop", service)
-            self._check_retcode(stop_service)
-        return True
+                retval = False
+            else:
+                stop_service = self.proc.run("systemctl", "stop", service)
+                self._check_retcode(stop_service)
+        return retval
 
     def install_previous(self, downgrade=False):
         """
@@ -500,9 +532,28 @@ class SaltPkgInstall:
                 with open(pref_file, "w") as fp:
                     fp.write(pref_contents)
                 cmd.append("--allow-downgrades")
-            ret = self.proc.run(self.pkg_mngr, "update")
-            ret = self.proc.run(*cmd)
-            self._check_retcode(ret)
+            env = os.environ.copy()
+            env["DEBIAN_FRONTEND"] = "noninteractive"
+            extra_args = [
+                "-o",
+                "DPkg::Options::=--force-confdef",
+                "-o",
+                "DPkg::Options::=--force-confold",
+            ]
+            ret = self.proc.run(self.pkg_mngr, "update", *extra_args, env=env)
+
+            cmd.extend(extra_args)
+
+            ret = self.proc.run(*cmd, env=env)
+            # Pre-relenv packages down get downgraded to cleanly programmatically
+            # They work manually, and the install tests after downgrades will catch problems with the install
+            # Let's not check the returncode if this is the case
+            if not (
+                downgrade
+                and not packaging.version.parse(self.prev_version)
+                >= packaging.version.parse("3006.0")
+            ):
+                self._check_retcode(ret)
             if downgrade:
                 pref_file.unlink()
             self.stop_services()
diff --git a/pkg/tests/upgrade/test_salt_upgrade.py b/pkg/tests/upgrade/test_salt_upgrade.py
index cdfc9e484ab..63732ed7577 100644
--- a/pkg/tests/upgrade/test_salt_upgrade.py
+++ b/pkg/tests/upgrade/test_salt_upgrade.py
@@ -28,19 +28,12 @@ def test_salt_upgrade(salt_call_cli, install_salt):
 
     # Upgrade Salt from previous version and test
     install_salt.install(upgrade=True)
-    new_py_version = install_salt.package_python_version()
     ret = salt_call_cli.run("test.version")
     assert ret.returncode == 0
     assert ret.data == install_salt.artifact_version
 
-    # Install dep following upgrade
-    # TODO: This should be removed when we stop testing against versions < 3006.0
-    if (
-        install_salt.relenv and original_py_version != new_py_version
-    ) or not install_salt.relenv:
-        install = salt_call_cli.run("--local", "pip.install", dep)
-        assert install.returncode == 0
-
-    # test pip install after an upgrade
-    use_lib = salt_call_cli.run("--local", "github.get_repo_info", repo)
-    assert "Authentication information could" in use_lib.stderr
+    if install_salt.relenv:
+        new_py_version = install_salt.package_python_version()
+        if new_py_version == original_py_version:
+            # test pip install after an upgrade
+            use_lib = salt_call_cli.run("--local", "github.get_repo_info", repo)

From 65a95224095a6d90fd9a8c8af92394a753928ef7 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Wed, 9 Aug 2023 11:30:35 -0400
Subject: [PATCH 25/65] Fix breaks and replaces conditions in debian control
 file

---
 pkg/debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/debian/control b/pkg/debian/control
index 511850c4769..e742cf6979a 100644
--- a/pkg/debian/control
+++ b/pkg/debian/control
@@ -77,8 +77,8 @@ Description: remote manager to administer servers via salt
 
 Package: salt-minion
 Architecture: amd64 arm64
-Replaces: salt-common (<< 3006.1~)
-Breaks: salt-common (<< 3006.1~)
+Replaces: salt-common (<< 3006.2)
+Breaks: salt-common (<< 3006.2)
 Depends: bsdmainutils,
          dctrl-tools,
          salt-common (= ${source:Version}),

From d2ccbe4909a77dbffc07e8c5a2c8453e8ca88a38 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Wed, 9 Aug 2023 11:33:58 -0400
Subject: [PATCH 26/65] Replace `os.sep` with `/` for statements under
 conditionals where that is the only possibility

---
 pkg/tests/support/helpers.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py
index 459c13d78ef..94e1517d1d0 100644
--- a/pkg/tests/support/helpers.py
+++ b/pkg/tests/support/helpers.py
@@ -231,7 +231,7 @@ class SaltPkgInstall:
                     else:
                         log.error("Unexpected file extension: %s", self.file_ext)
                 elif platform.is_darwin():
-                    self.root = pathlib.Path(os.sep, "opt")
+                    self.root = pathlib.Path("/opt")
                     if self.file_ext == "pkg":
                         self.bin_dir = self.root / "salt" / "bin"
                         self.run_root = self.bin_dir / "run"
@@ -358,7 +358,7 @@ class SaltPkgInstall:
             self.update_process_path()
 
         elif platform.is_darwin():
-            daemons_dir = pathlib.Path(os.sep, "Library", "LaunchDaemons")
+            daemons_dir = pathlib.Path("/Library", "LaunchDaemons")
             service_name = "com.saltstack.salt.minion"
             plist_file = daemons_dir / f"{service_name}.plist"
             log.debug("Installing: %s", str(pkg))
@@ -646,7 +646,7 @@ class SaltPkgInstall:
 
         elif platform.is_darwin():
             # From here: https://stackoverflow.com/a/46118276/4581998
-            daemons_dir = pathlib.Path(os.sep, "Library", "LaunchDaemons")
+            daemons_dir = pathlib.Path("/Library", "LaunchDaemons")
             for service in ("minion", "master", "api", "syndic"):
                 service_name = f"com.saltstack.salt.{service}"
                 plist_file = daemons_dir / f"{service_name}.plist"
@@ -736,7 +736,7 @@ class SaltPkgInstall:
         ret = self.proc.run("launchctl", "list", service_name)
         # 113 means it couldn't find a service with that name
         if ret.returncode == 113:
-            daemons_dir = pathlib.Path(os.sep, "Library", "LaunchDaemons")
+            daemons_dir = pathlib.Path("/Library", "LaunchDaemons")
             plist_file = daemons_dir / f"{service_name}.plist"
             # Make sure we're using this plist file
             if plist_file.exists():
@@ -812,9 +812,7 @@ class SaltPkgInstall:
                 binary = shutil.which(binary[0]) or binary[0]
             elif isinstance(binary, list):
                 binary = " ".join(binary)
-            unit_path = pathlib.Path(
-                os.sep, "etc", "systemd", "system", f"{service}.service"
-            )
+            unit_path = pathlib.Path("/etc", "systemd", "system", f"{service}.service")
             contents = contents.format(
                 service=service, tgt=binary, conf_dir=self.conf_dir
             )
@@ -855,7 +853,7 @@ class PkgLaunchdSaltDaemonImpl(PkgSystemdSaltDaemonImpl):
 
     @plist_file.default
     def _default_plist_file(self):
-        daemons_dir = pathlib.Path(os.sep, "Library", "LaunchDaemons")
+        daemons_dir = pathlib.Path("/Library", "LaunchDaemons")
         return daemons_dir / f"{self.get_service_name()}.plist"
 
     def get_service_name(self):

From 1518b9617ce379463f925856524e7331793ea737 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Thu, 10 Aug 2023 18:43:02 -0400
Subject: [PATCH 27/65] Fix windows downgrade tests

---
 pkg/debian/control                         |  4 +-
 pkg/tests/conftest.py                      |  6 +++
 pkg/tests/downgrade/test_salt_downgrade.py | 18 +++++--
 pkg/tests/integration/test_help.py         | 14 ++++--
 pkg/tests/integration/test_multi_minion.py |  9 ++++
 pkg/tests/integration/test_version.py      |  7 ++-
 pkg/tests/support/helpers.py               | 57 +++++++++++++++++-----
 7 files changed, 93 insertions(+), 22 deletions(-)

diff --git a/pkg/debian/control b/pkg/debian/control
index e742cf6979a..a6a9e25b404 100644
--- a/pkg/debian/control
+++ b/pkg/debian/control
@@ -77,8 +77,8 @@ Description: remote manager to administer servers via salt
 
 Package: salt-minion
 Architecture: amd64 arm64
-Replaces: salt-common (<< 3006.2)
-Breaks: salt-common (<< 3006.2)
+Replaces: salt-common (<= 3006.1)
+Breaks: salt-common (<= 3006.1)
 Depends: bsdmainutils,
          dctrl-tools,
          salt-common (= ${source:Version}),
diff --git a/pkg/tests/conftest.py b/pkg/tests/conftest.py
index d450bdf7eab..819850f1c4e 100644
--- a/pkg/tests/conftest.py
+++ b/pkg/tests/conftest.py
@@ -383,6 +383,12 @@ def salt_master(salt_factories, install_salt, state_tree, pillar_tree):
             master_script = True
         elif not install_salt.upgrade:
             master_script = True
+        if (
+            not install_salt.relenv
+            and install_salt.use_prev_version
+            and not install_salt.classic
+        ):
+            master_script = False
 
     if master_script:
         salt_factories.system_install = False
diff --git a/pkg/tests/downgrade/test_salt_downgrade.py b/pkg/tests/downgrade/test_salt_downgrade.py
index dd95e8c00cb..02f5699d426 100644
--- a/pkg/tests/downgrade/test_salt_downgrade.py
+++ b/pkg/tests/downgrade/test_salt_downgrade.py
@@ -1,5 +1,6 @@
 import pytest
 from packaging.version import parse
+from pytestskipmarkers.utils import platform
 
 
 def test_salt_downgrade(salt_call_cli, install_salt):
@@ -31,11 +32,20 @@ def test_salt_downgrade(salt_call_cli, install_salt):
 
     # Downgrade Salt to the previous version and test
     install_salt.install(downgrade=True)
-    ret = install_salt.proc.run("salt", "--version")
-    assert ret.returncode == 0
-    assert parse(ret.stdout.strip().split()[-1]) < parse(install_salt.artifact_version)
+    bin_file = "salt"
+    if platform.is_windows():
+        if not is_downgrade_to_relenv:
+            bin_file = install_salt.install_dir / "salt-call.bat"
+        else:
+            bin_file = install_salt.install_dir / "salt-call.exe"
 
-    if is_downgrade_to_relenv:
+    ret = install_salt.proc.run(bin_file, "--version")
+    assert ret.returncode == 0
+    assert parse(ret.stdout.strip().split()[1]) < parse(install_salt.artifact_version)
+
+    # Windows does not keep the extras directory around in the same state
+    # TODO: Fix this problem in windows installers
+    if is_downgrade_to_relenv and not platform.is_windows():
         new_py_version = install_salt.package_python_version()
         if new_py_version == original_py_version:
             # test pip install after a downgrade
diff --git a/pkg/tests/integration/test_help.py b/pkg/tests/integration/test_help.py
index 1285c8a6aea..b5070638fe2 100644
--- a/pkg/tests/integration/test_help.py
+++ b/pkg/tests/integration/test_help.py
@@ -1,19 +1,25 @@
+import subprocess
+
+
 def test_help(install_salt):
     """
     Test --help works for all salt cmds
     """
     for cmd in install_salt.binary_paths.values():
-        # TODO: add back salt-cloud and salt-ssh when its fixed
         cmd = [str(x) for x in cmd]
 
         if len(cmd) > 1 and "shell" in cmd[1]:
             # Singlebin build, unable to get the version
             continue
 
-        if "python" in cmd[0]:
-            ret = install_salt.proc.run(*cmd, "--version")
+        if "python" in cmd[0] and len(cmd) == 1:
+            ret = install_salt.proc.run(
+                *cmd, "--version", stdout=subprocess.PIPE, stderr=subprocess.PIPE
+            )
             assert "Python" in ret.stdout
         else:
-            ret = install_salt.proc.run(*cmd, "--help")
+            ret = install_salt.proc.run(
+                *cmd, "--help", stdout=subprocess.PIPE, stderr=subprocess.PIPE
+            )
             assert "Usage" in ret.stdout
             assert ret.returncode == 0
diff --git a/pkg/tests/integration/test_multi_minion.py b/pkg/tests/integration/test_multi_minion.py
index 13d64f31f6e..0d66933b0b8 100644
--- a/pkg/tests/integration/test_multi_minion.py
+++ b/pkg/tests/integration/test_multi_minion.py
@@ -4,12 +4,21 @@ import subprocess
 
 import psutil
 import pytest
+from packaging.version import parse
 
 pytestmark = [
     pytest.mark.skip_unless_on_windows,
 ]
 
 
+@pytest.fixture(autouse=True)
+def skip_on_less_than_3006_1(install_salt):
+    if parse(install_salt.version) <= parse("3006.1"):
+        pytest.skip(
+            "Multi-minion script only available on versions greater than 3006.1"
+        )
+
+
 @pytest.fixture
 def mm_script(install_salt):
     yield install_salt.ssm_bin.parent / "multi-minion.ps1"
diff --git a/pkg/tests/integration/test_version.py b/pkg/tests/integration/test_version.py
index 730bf5b3b9a..434cd93532c 100644
--- a/pkg/tests/integration/test_version.py
+++ b/pkg/tests/integration/test_version.py
@@ -55,7 +55,12 @@ def test_compare_versions(version, binary, install_salt):
     Test compare versions
     """
     if binary in install_salt.binary_paths:
-        ret = install_salt.proc.run(*install_salt.binary_paths[binary], "--version")
+        ret = install_salt.proc.run(
+            *install_salt.binary_paths[binary],
+            "--version",
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+        )
         ret.stdout.matcher.fnmatch_lines([f"*{version}*"])
     else:
         if platform.is_windows():
diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py
index 94e1517d1d0..3e1e836bfc4 100644
--- a/pkg/tests/support/helpers.py
+++ b/pkg/tests/support/helpers.py
@@ -228,8 +228,25 @@ class SaltPkgInstall:
                         self.root = self.install_dir.parent
                         self.bin_dir = self.install_dir
                         self.ssm_bin = self.install_dir / "ssm.exe"
+                        self.run_root = self.bin_dir / "bin" / "salt.exe"
+                        if not self.relenv and not self.classic:
+                            self.ssm_bin = self.bin_dir / "bin" / "ssm.exe"
                     else:
                         log.error("Unexpected file extension: %s", self.file_ext)
+                    if self.use_prev_version:
+                        self.bin_dir = self.install_dir / "bin"
+                        self.run_root = self.bin_dir / "salt.exe"
+                        self.ssm_bin = self.bin_dir / "ssm.exe"
+                        if self.file_ext == "msi" or self.relenv:
+                            self.ssm_bin = self.install_dir / "ssm.exe"
+                        if (
+                            self.install_dir / "salt-minion.exe"
+                        ).exists() and not self.relenv:
+                            log.debug(
+                                f"Removing {(self.install_dir / 'salt-minion.exe')}"
+                            )
+                            (self.install_dir / "salt-minion.exe").unlink()
+
                 elif platform.is_darwin():
                     self.root = pathlib.Path("/opt")
                     if self.file_ext == "pkg":
@@ -244,13 +261,31 @@ class SaltPkgInstall:
         python_bin = self.install_dir / "bin" / "python3"
         if platform.is_windows():
             python_bin = self.install_dir / "Scripts" / "python.exe"
-            self.binary_paths = {
-                "call": ["salt-call.exe"],
-                "cp": ["salt-cp.exe"],
-                "minion": ["salt-minion.exe"],
-                "pip": ["salt-pip.exe"],
-                "python": [python_bin],
-            }
+            if self.relenv:
+                self.binary_paths = {
+                    "call": ["salt-call.exe"],
+                    "cp": ["salt-cp.exe"],
+                    "minion": ["salt-minion.exe"],
+                    "pip": ["salt-pip.exe"],
+                    "python": [python_bin],
+                }
+            elif self.classic:
+                self.binary_paths = {
+                    "call": [self.install_dir / "salt-call.bat"],
+                    "cp": [self.install_dir / "salt-cp.bat"],
+                    "minion": [self.install_dir / "salt-minion.bat"],
+                    "python": [self.bin_dir / "python.exe"],
+                }
+                self.binary_paths["pip"] = self.binary_paths["python"] + ["-m", "pip"]
+            else:
+                self.binary_paths = {
+                    "call": [str(self.run_root), "call"],
+                    "cp": [str(self.run_root), "cp"],
+                    "minion": [str(self.run_root), "minion"],
+                    "pip": [str(self.run_root), "pip"],
+                    "python": [str(self.run_root), "shell"],
+                }
+
         else:
             if os.path.exists(self.install_dir / "bin" / "salt"):
                 install_dir = self.install_dir / "bin"
@@ -559,7 +594,7 @@ class SaltPkgInstall:
             self.stop_services()
         elif platform.is_windows():
             self.bin_dir = self.install_dir / "bin"
-            self.run_root = self.bin_dir / f"salt.exe"
+            self.run_root = self.bin_dir / "salt.exe"
             self.ssm_bin = self.bin_dir / "ssm.exe"
             if self.file_ext == "msi" or relenv:
                 self.ssm_bin = self.install_dir / "ssm.exe"
@@ -578,11 +613,11 @@ class SaltPkgInstall:
                     win_pkg_url = f"https://repo.saltproject.io/salt/py3/windows/{major_ver}/{win_pkg}"
             else:
                 if self.file_ext == "msi":
-                    win_pkg = f"Salt-Minion-{major_ver}-1-Py3-AMD64.{self.file_ext}"
-                elif self.file_ext == "exe":
                     win_pkg = (
-                        f"Salt-Minion-{major_ver}-1-Py3-AMD64-Setup.{self.file_ext}"
+                        f"Salt-Minion-{self.prev_version}-Py3-AMD64.{self.file_ext}"
                     )
+                elif self.file_ext == "exe":
+                    win_pkg = f"Salt-Minion-{self.prev_version}-Py3-AMD64-Setup.{self.file_ext}"
                 win_pkg_url = f"https://repo.saltproject.io/windows/{win_pkg}"
             pkg_path = pathlib.Path(r"C:\TEMP", win_pkg)
             pkg_path.parent.mkdir(exist_ok=True)

From 6f5fc9ba18b25c8c792f22cc733ceb157c5f8b50 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Tue, 15 Aug 2023 14:45:58 -0400
Subject: [PATCH 28/65] Add `Breaks` for salt-ssh and salt-cloud

---
 pkg/debian/control | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/debian/control b/pkg/debian/control
index a6a9e25b404..7d9534352fc 100644
--- a/pkg/debian/control
+++ b/pkg/debian/control
@@ -131,6 +131,7 @@ Description: master-of-masters for salt, the distributed remote execution system
 
 Package: salt-ssh
 Architecture: amd64 arm64
+Breaks: salt-common (<= 3006.2)
 Depends: salt-common (= ${source:Version}),
          openssh-client,
          ${misc:Depends}
@@ -159,6 +160,7 @@ Description: remote manager to administer servers via Salt SSH
 
 Package: salt-cloud
 Architecture: amd64 arm64
+Breaks: salt-common (<= 3006.1)
 Depends: salt-common (= ${source:Version}),
          ${misc:Depends}
 Description: public cloud VM management system

From 207799510888b263017817f55dcadd0a00644700 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Tue, 15 Aug 2023 14:49:06 -0400
Subject: [PATCH 29/65] Allow getting the latest 3005 release from GH releases,
 we are publishing them consistently now

---
 pkg/debian/control |  2 +-
 tools/ci.py        | 12 +-----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkg/debian/control b/pkg/debian/control
index 7d9534352fc..da618374fed 100644
--- a/pkg/debian/control
+++ b/pkg/debian/control
@@ -160,7 +160,7 @@ Description: remote manager to administer servers via Salt SSH
 
 Package: salt-cloud
 Architecture: amd64 arm64
-Breaks: salt-common (<= 3006.1)
+Breaks: salt-common (<= 3006.2)
 Depends: salt-common (= ${source:Version}),
          ${misc:Depends}
 Description: public cloud VM management system
diff --git a/tools/ci.py b/tools/ci.py
index 0e29d9ad864..7d047ec6699 100644
--- a/tools/ci.py
+++ b/tools/ci.py
@@ -918,7 +918,7 @@ def get_testing_releases(
         ctx.exit(1, "The 'GITHUB_OUTPUT' variable is not set.")
     else:
         # We aren't testing upgrades from anything before 3006.0 except the latest 3005.x
-        threshold_major = 3006
+        threshold_major = 3005
         parsed_salt_version = tools.utils.Version(salt_version)
         # We want the latest 4 major versions, removing the oldest if this version is a new major
         num_major_versions = 4
@@ -941,16 +941,6 @@ def get_testing_releases(
             ]
             testing_releases.append(minors_of_major[-1])
 
-        # TODO: Remove this block when we reach version 3009.0
-        # Append the latest minor version of 3005 if we don't have enough major versions to test against
-        if len(testing_releases) != num_major_versions:
-            url = "https://repo.saltproject.io/salt/onedir/repo.json"
-            ret = ctx.web.get(url)
-            repo_data = ret.json()
-            latest = list(repo_data["latest"].keys())[0]
-            version = repo_data["latest"][latest]["version"]
-            testing_releases = [version] + testing_releases
-
         str_releases = [str(version) for version in testing_releases]
 
         with open(github_output, "a", encoding="utf-8") as wfh:

From 03484f70a99a9b4b67fc95432a3a0f95d97a45f9 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Wed, 16 Aug 2023 16:54:22 -0400
Subject: [PATCH 30/65] Fix windows urls

---
 pkg/tests/support/helpers.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py
index 3e1e836bfc4..d4eed7e5027 100644
--- a/pkg/tests/support/helpers.py
+++ b/pkg/tests/support/helpers.py
@@ -601,8 +601,9 @@ class SaltPkgInstall:
 
             if not self.classic:
                 if not relenv:
-                    win_pkg = f"salt-{self.prev_version}-windows-amd64.{self.file_ext}"
-                    win_pkg_url = f"https://repo.saltproject.io/salt/py3/windows/{self.prev_version}/{win_pkg}"
+                    win_pkg = (
+                        f"salt-{self.prev_version}-1-windows-amd64.{self.file_ext}"
+                    )
                 else:
                     if self.file_ext == "msi":
                         win_pkg = (
@@ -610,7 +611,7 @@ class SaltPkgInstall:
                         )
                     elif self.file_ext == "exe":
                         win_pkg = f"Salt-Minion-{self.prev_version}-Py3-AMD64-Setup.{self.file_ext}"
-                    win_pkg_url = f"https://repo.saltproject.io/salt/py3/windows/{major_ver}/{win_pkg}"
+                win_pkg_url = f"https://repo.saltproject.io/salt/py3/windows/{major_ver}/{win_pkg}"
             else:
                 if self.file_ext == "msi":
                     win_pkg = (

From babc5c12c0721789b776d1b349f64b9ce5c41a87 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Wed, 16 Aug 2023 17:04:48 -0400
Subject: [PATCH 31/65] Address review comments

---
 pkg/tests/conftest.py                      |  2 +-
 pkg/tests/downgrade/test_salt_downgrade.py | 14 ++++++++++----
 pkg/tests/integration/test_multi_minion.py |  6 ++++--
 pkg/tests/support/helpers.py               |  8 ++++----
 pkg/tests/upgrade/test_salt_upgrade.py     |  9 +++++++--
 5 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/pkg/tests/conftest.py b/pkg/tests/conftest.py
index 819850f1c4e..407f5b334a6 100644
--- a/pkg/tests/conftest.py
+++ b/pkg/tests/conftest.py
@@ -26,7 +26,7 @@ from tests.support.sminion import create_sminion
 log = logging.getLogger(__name__)
 
 
-@pytest.fixture
+@pytest.fixture(scope="session")
 def version(install_salt):
     """
     get version number from artifact
diff --git a/pkg/tests/downgrade/test_salt_downgrade.py b/pkg/tests/downgrade/test_salt_downgrade.py
index 02f5699d426..263967e35f6 100644
--- a/pkg/tests/downgrade/test_salt_downgrade.py
+++ b/pkg/tests/downgrade/test_salt_downgrade.py
@@ -1,5 +1,5 @@
+import packaging.version
 import pytest
-from packaging.version import parse
 from pytestskipmarkers.utils import platform
 
 
@@ -10,7 +10,9 @@ def test_salt_downgrade(salt_call_cli, install_salt):
     if not install_salt.downgrade:
         pytest.skip("Not testing a downgrade, do not run")
 
-    is_downgrade_to_relenv = parse(install_salt.prev_version) >= parse("3006.0")
+    is_downgrade_to_relenv = packaging.version.parse(
+        install_salt.prev_version
+    ) >= packaging.version.parse("3006.0")
 
     if is_downgrade_to_relenv:
         original_py_version = install_salt.package_python_version()
@@ -18,7 +20,9 @@ def test_salt_downgrade(salt_call_cli, install_salt):
     # Verify current install version is setup correctly and works
     ret = salt_call_cli.run("test.version")
     assert ret.returncode == 0
-    assert parse(ret.data) == parse(install_salt.artifact_version)
+    assert packaging.version.parse(ret.data) == packaging.version.parse(
+        install_salt.artifact_version
+    )
 
     # Test pip install before a downgrade
     dep = "PyGithub==1.56.0"
@@ -41,7 +45,9 @@ def test_salt_downgrade(salt_call_cli, install_salt):
 
     ret = install_salt.proc.run(bin_file, "--version")
     assert ret.returncode == 0
-    assert parse(ret.stdout.strip().split()[1]) < parse(install_salt.artifact_version)
+    assert packaging.version.parse(
+        ret.stdout.strip().split()[1]
+    ) < packaging.version.parse(install_salt.artifact_version)
 
     # Windows does not keep the extras directory around in the same state
     # TODO: Fix this problem in windows installers
diff --git a/pkg/tests/integration/test_multi_minion.py b/pkg/tests/integration/test_multi_minion.py
index 0d66933b0b8..923ad6eecc6 100644
--- a/pkg/tests/integration/test_multi_minion.py
+++ b/pkg/tests/integration/test_multi_minion.py
@@ -2,9 +2,9 @@ import os
 import pathlib
 import subprocess
 
+import packaging.version
 import psutil
 import pytest
-from packaging.version import parse
 
 pytestmark = [
     pytest.mark.skip_unless_on_windows,
@@ -13,7 +13,9 @@ pytestmark = [
 
 @pytest.fixture(autouse=True)
 def skip_on_less_than_3006_1(install_salt):
-    if parse(install_salt.version) <= parse("3006.1"):
+    if packaging.version.parse(install_salt.version) <= packaging.version.parse(
+        "3006.1"
+    ):
         pytest.skip(
             "Multi-minion script only available on versions greater than 3006.1"
         )
diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py
index d4eed7e5027..1bb38fc603c 100644
--- a/pkg/tests/support/helpers.py
+++ b/pkg/tests/support/helpers.py
@@ -557,15 +557,15 @@ class SaltPkgInstall:
             if downgrade:
                 pref_file = pathlib.Path("/etc", "apt", "preferences.d", "salt.pref")
                 pref_file.parent.mkdir(exist_ok=True)
-                pref_contents = textwrap.dedent(
-                    """\
+                pref_file.write_text(
+                    textwrap.dedent(
+                        """\
                 Package: salt*
                 Pin: origin "repo.saltproject.io"
                 Pin-Priority: 1001
                 """
+                    )
                 )
-                with open(pref_file, "w") as fp:
-                    fp.write(pref_contents)
                 cmd.append("--allow-downgrades")
             env = os.environ.copy()
             env["DEBIAN_FRONTEND"] = "noninteractive"
diff --git a/pkg/tests/upgrade/test_salt_upgrade.py b/pkg/tests/upgrade/test_salt_upgrade.py
index 63732ed7577..d844b5807da 100644
--- a/pkg/tests/upgrade/test_salt_upgrade.py
+++ b/pkg/tests/upgrade/test_salt_upgrade.py
@@ -1,3 +1,4 @@
+import packaging.version
 import pytest
 
 
@@ -14,7 +15,9 @@ def test_salt_upgrade(salt_call_cli, install_salt):
     # Verify previous install version is setup correctly and works
     ret = salt_call_cli.run("test.version")
     assert ret.returncode == 0
-    assert ret.data < install_salt.artifact_version
+    assert packaging.version.parse(ret.data) < packaging.version.parse(
+        install_salt.artifact_version
+    )
 
     # Test pip install before an upgrade
     dep = "PyGithub==1.56.0"
@@ -30,7 +33,9 @@ def test_salt_upgrade(salt_call_cli, install_salt):
     install_salt.install(upgrade=True)
     ret = salt_call_cli.run("test.version")
     assert ret.returncode == 0
-    assert ret.data == install_salt.artifact_version
+    assert packaging.version.parse(ret.data) == packaging.version.parse(
+        install_salt.artifact_version
+    )
 
     if install_salt.relenv:
         new_py_version = install_salt.package_python_version()

From 22ad117510ff8fd30f51af6313918138f824033c Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Wed, 16 Aug 2023 19:09:46 -0400
Subject: [PATCH 32/65] Fix tiamat macos .pkg links

---
 pkg/tests/support/helpers.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py
index 1bb38fc603c..6785ed590dd 100644
--- a/pkg/tests/support/helpers.py
+++ b/pkg/tests/support/helpers.py
@@ -652,11 +652,12 @@ class SaltPkgInstall:
                 mac_pkg_url = f"https://repo.saltproject.io/osx/{mac_pkg}"
             else:
                 if not relenv:
-                    mac_pkg = f"salt-{self.prev_version}-macos-x86_64.pkg"
-                    mac_pkg_url = f"https://repo.saltproject.io/salt/py3/macos/{self.prev_version}/{mac_pkg}"
+                    mac_pkg = f"salt-{self.prev_version}-1-macos-x86_64.pkg"
                 else:
                     mac_pkg = f"salt-{self.prev_version}-py3-x86_64.pkg"
-                    mac_pkg_url = f"https://repo.saltproject.io/salt/py3/macos/{major_ver}/{mac_pkg}"
+                mac_pkg_url = (
+                    f"https://repo.saltproject.io/salt/py3/macos/{major_ver}/{mac_pkg}"
+                )
 
             mac_pkg_path = f"/tmp/{mac_pkg}"
             if not os.path.exists(mac_pkg_path):

From 6795de1e431ec4768477907a526b41ca878c32d3 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Thu, 17 Aug 2023 16:53:29 -0400
Subject: [PATCH 33/65] Force salt-common to create /etc/salt

---
 pkg/debian/salt-common.dirs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/debian/salt-common.dirs b/pkg/debian/salt-common.dirs
index 37d1dd556a8..5c6dd29e224 100644
--- a/pkg/debian/salt-common.dirs
+++ b/pkg/debian/salt-common.dirs
@@ -3,3 +3,4 @@
 /var/run/salt
 /usr/share/fish/vendor_completions.d
 /opt/saltstack/salt
+/etc/salt

From 660be2a5d0309b0d6aeeabbeb0e86361f4378794 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Fri, 18 Aug 2023 13:47:44 -0400
Subject: [PATCH 34/65] Add skip for testing package path ownership on versions
 <=3006.2

---
 pkg/tests/integration/test_salt_user.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkg/tests/integration/test_salt_user.py b/pkg/tests/integration/test_salt_user.py
index 3b5e8e098e4..5b1f426c560 100644
--- a/pkg/tests/integration/test_salt_user.py
+++ b/pkg/tests/integration/test_salt_user.py
@@ -3,10 +3,9 @@ import pathlib
 import subprocess
 import sys
 
+import packaging.version
 import psutil
 import pytest
-import yaml
-from pytestskipmarkers.utils import platform
 
 pytestmark = [
     pytest.mark.skip_on_windows,
@@ -135,6 +134,10 @@ def test_pkg_paths(
     """
     Test package paths ownership
     """
+    if packaging.version.parse(install_salt.version) <= packaging.version.parse(
+        "3006.2"
+    ):
+        pytest.skip("Package path ownership was changed in salt 3006.3")
     salt_user_subdirs = []
     for _path in pkg_paths:
         pkg_path = pathlib.Path(_path)

From dabc91ce753a7cf576955c87642809d85f65b4f1 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Mon, 28 Aug 2023 16:49:37 -0400
Subject: [PATCH 35/65] Some fixes for macos tiamat downgrade tests

---
 pkg/tests/integration/test_salt_exec.py | 2 +-
 pkg/tests/support/helpers.py            | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkg/tests/integration/test_salt_exec.py b/pkg/tests/integration/test_salt_exec.py
index ce12d10e4dd..ef2e6145be3 100644
--- a/pkg/tests/integration/test_salt_exec.py
+++ b/pkg/tests/integration/test_salt_exec.py
@@ -15,7 +15,7 @@ def test_salt_cmd_run(salt_cli, salt_minion):
     if platform.startswith("win"):
         ret = salt_cli.run("cmd.run", "ipconfig", minion_tgt=salt_minion.id)
     else:
-        ret = salt_cli.run("cmd.run", "ls -lah /", minion_tgt=salt_minion.id)
+        ret = salt_cli.run("cmd.run", "'ls -lah /'", minion_tgt=salt_minion.id)
     assert ret
     assert ret.stdout
 
diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py
index 6785ed590dd..67b7014852d 100644
--- a/pkg/tests/support/helpers.py
+++ b/pkg/tests/support/helpers.py
@@ -333,7 +333,10 @@ class SaltPkgInstall:
                     )
                 else:
                     self.binary_paths["python"] = [shutil.which("salt"), "shell"]
-                    self.binary_paths["pip"] = [shutil.which("salt-pip")]
+                    if platform.is_darwin():
+                        self.binary_paths["pip"] = [self.run_root, "pip"]
+                    else:
+                        self.binary_paths["pip"] = [shutil.which("salt-pip")]
 
     @staticmethod
     def salt_factories_root_dir(system_service: bool = False) -> pathlib.Path:

From 688dc4a832ae17c779f0e3d20c2b264d2400b488 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Mon, 28 Aug 2023 16:54:15 -0400
Subject: [PATCH 36/65] Some fixes for classic package downgrade tests and also
 workaround macos installers not preserving the extras directory (for now)

---
 pkg/tests/downgrade/test_salt_downgrade.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkg/tests/downgrade/test_salt_downgrade.py b/pkg/tests/downgrade/test_salt_downgrade.py
index 263967e35f6..e357477a068 100644
--- a/pkg/tests/downgrade/test_salt_downgrade.py
+++ b/pkg/tests/downgrade/test_salt_downgrade.py
@@ -1,3 +1,5 @@
+import shutil
+
 import packaging.version
 import pytest
 from pytestskipmarkers.utils import platform
@@ -36,7 +38,7 @@ def test_salt_downgrade(salt_call_cli, install_salt):
 
     # Downgrade Salt to the previous version and test
     install_salt.install(downgrade=True)
-    bin_file = "salt"
+    bin_file = shutil.which("salt")
     if platform.is_windows():
         if not is_downgrade_to_relenv:
             bin_file = install_salt.install_dir / "salt-call.bat"
@@ -51,7 +53,8 @@ def test_salt_downgrade(salt_call_cli, install_salt):
 
     # Windows does not keep the extras directory around in the same state
     # TODO: Fix this problem in windows installers
-    if is_downgrade_to_relenv and not platform.is_windows():
+    # TODO: Fix this problem in macos installers
+    if is_downgrade_to_relenv and not (platform.is_windows() or platform.is_darwin()):
         new_py_version = install_salt.package_python_version()
         if new_py_version == original_py_version:
             # test pip install after a downgrade

From a5d94bd33d119001b59f7b9e44ea3a66dea7d15d Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Tue, 29 Aug 2023 13:19:10 -0400
Subject: [PATCH 37/65] Get the classic downgrade tests passing for macos
 packages

---
 pkg/tests/downgrade/test_salt_downgrade.py | 4 +++-
 pkg/tests/support/helpers.py               | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkg/tests/downgrade/test_salt_downgrade.py b/pkg/tests/downgrade/test_salt_downgrade.py
index e357477a068..c5af8f72c1a 100644
--- a/pkg/tests/downgrade/test_salt_downgrade.py
+++ b/pkg/tests/downgrade/test_salt_downgrade.py
@@ -38,12 +38,14 @@ def test_salt_downgrade(salt_call_cli, install_salt):
 
     # Downgrade Salt to the previous version and test
     install_salt.install(downgrade=True)
-    bin_file = shutil.which("salt")
+    bin_file = "salt"
     if platform.is_windows():
         if not is_downgrade_to_relenv:
             bin_file = install_salt.install_dir / "salt-call.bat"
         else:
             bin_file = install_salt.install_dir / "salt-call.exe"
+    elif platform.is_darwin() and install_salt.classic:
+        bin_file = install_salt.bin_dir / "salt-call"
 
     ret = install_salt.proc.run(bin_file, "--version")
     assert ret.returncode == 0
diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py
index 67b7014852d..327a90c3dc3 100644
--- a/pkg/tests/support/helpers.py
+++ b/pkg/tests/support/helpers.py
@@ -152,7 +152,6 @@ class SaltPkgInstall:
                 os.getenv("ProgramFiles"), "Salt Project", "Salt"
             ).resolve()
         elif platform.is_darwin():
-            # TODO: Add mac install dir path
             install_dir = pathlib.Path("/opt", "salt")
         else:
             install_dir = pathlib.Path("/opt", "saltstack", "salt")

From 57ffd676615ad215008587d10f44a5e5533a8a4c Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Tue, 29 Aug 2023 13:41:39 -0400
Subject: [PATCH 38/65] Some more fixes for the tiamat downgrade tests for
 macos

---
 pkg/tests/integration/test_pip.py     | 2 --
 pkg/tests/integration/test_version.py | 2 ++
 pkg/tests/support/helpers.py          | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkg/tests/integration/test_pip.py b/pkg/tests/integration/test_pip.py
index c930dc6c576..fa20962aa8b 100644
--- a/pkg/tests/integration/test_pip.py
+++ b/pkg/tests/integration/test_pip.py
@@ -12,8 +12,6 @@ from pytestskipmarkers.utils import platform
 def pypath():
     if platform.is_windows():
         return pathlib.Path(os.getenv("ProgramFiles"), "Salt Project", "Salt")
-    elif platform.is_darwin():
-        return pathlib.Path("/opt", "salt", "bin")
     else:
         return pathlib.Path("/opt", "saltstack", "salt", "pypath", "bin")
 
diff --git a/pkg/tests/integration/test_version.py b/pkg/tests/integration/test_version.py
index 434cd93532c..eeeee21c8f9 100644
--- a/pkg/tests/integration/test_version.py
+++ b/pkg/tests/integration/test_version.py
@@ -94,6 +94,8 @@ def test_symlinks_created(version, symlink, install_salt):
     """
     Test symlinks created
     """
+    if not install_salt.classic and symlink == "spm":
+        symlink = "salt-spm"
     ret = install_salt.proc.run(pathlib.Path("/usr/local/sbin") / symlink, "--version")
     ret.stdout.matcher.fnmatch_lines([f"*{version}*"])
 
diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py
index 327a90c3dc3..aba6a91f0f8 100644
--- a/pkg/tests/support/helpers.py
+++ b/pkg/tests/support/helpers.py
@@ -334,6 +334,7 @@ class SaltPkgInstall:
                     self.binary_paths["python"] = [shutil.which("salt"), "shell"]
                     if platform.is_darwin():
                         self.binary_paths["pip"] = [self.run_root, "pip"]
+                        self.binary_paths["spm"] = [shutil.which("salt-spm")]
                     else:
                         self.binary_paths["pip"] = [shutil.which("salt-pip")]
 

From a5d470513a68e866849320d43fbcd21668d0c650 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Tue, 29 Aug 2023 15:19:28 -0400
Subject: [PATCH 39/65] Fix condition regarding `salt-spm` on tiamat macos
 packages

---
 pkg/tests/integration/test_version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/tests/integration/test_version.py b/pkg/tests/integration/test_version.py
index eeeee21c8f9..d1893b3f2c6 100644
--- a/pkg/tests/integration/test_version.py
+++ b/pkg/tests/integration/test_version.py
@@ -94,7 +94,7 @@ def test_symlinks_created(version, symlink, install_salt):
     """
     Test symlinks created
     """
-    if not install_salt.classic and symlink == "spm":
+    if not install_salt.classic and not install_salt.relenv and symlink == "spm":
         symlink = "salt-spm"
     ret = install_salt.proc.run(pathlib.Path("/usr/local/sbin") / symlink, "--version")
     ret.stdout.matcher.fnmatch_lines([f"*{version}*"])

From 8c44dbcc1c66aec71216ed513cef624860fe8b4e Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Tue, 29 Aug 2023 16:26:56 -0400
Subject: [PATCH 40/65] Fix command escaping for classic macos packages

---
 pkg/tests/integration/test_salt_exec.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/tests/integration/test_salt_exec.py b/pkg/tests/integration/test_salt_exec.py
index ef2e6145be3..78b8cbd9b4e 100644
--- a/pkg/tests/integration/test_salt_exec.py
+++ b/pkg/tests/integration/test_salt_exec.py
@@ -15,7 +15,7 @@ def test_salt_cmd_run(salt_cli, salt_minion):
     if platform.startswith("win"):
         ret = salt_cli.run("cmd.run", "ipconfig", minion_tgt=salt_minion.id)
     else:
-        ret = salt_cli.run("cmd.run", "'ls -lah /'", minion_tgt=salt_minion.id)
+        ret = salt_cli.run("cmd.run", "\\'ls -lah /\\'", minion_tgt=salt_minion.id)
     assert ret
     assert ret.stdout
 

From dcd1f80cf816d6fecdd4f2ac7d922f28de74fec4 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Tue, 29 Aug 2023 16:39:24 -0400
Subject: [PATCH 41/65] Fix binary paths for classic macos packages

---
 pkg/tests/support/helpers.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py
index aba6a91f0f8..a9bb72e4815 100644
--- a/pkg/tests/support/helpers.py
+++ b/pkg/tests/support/helpers.py
@@ -330,6 +330,24 @@ class SaltPkgInstall:
                     self.proc.run(
                         *self.binary_paths["pip"], "install", "-U", "pyopenssl"
                     )
+                    if platform.is_darwin():
+                        # `which` is not catching the right paths on downgrades, explicitly defining them here
+                        self.binary_paths = {
+                            "salt": [self.bin_dir / "salt"],
+                            "api": [self.bin_dir / "salt-api"],
+                            "call": [self.bin_dir / "salt-call"],
+                            "cloud": [self.bin_dir / "salt-cloud"],
+                            "cp": [self.bin_dir / "salt-cp"],
+                            "key": [self.bin_dir / "salt-key"],
+                            "master": [self.bin_dir / "salt-master"],
+                            "minion": [self.bin_dir / "salt-minion"],
+                            "proxy": [self.bin_dir / "salt-proxy"],
+                            "run": [self.bin_dir / "salt-run"],
+                            "ssh": [self.bin_dir / "salt-ssh"],
+                            "syndic": [self.bin_dir / "salt-syndic"],
+                            "spm": [self.bin_dir / "spm"],
+                            "python": [str(pathlib.Path("/usr/bin/python3"))],
+                        }
                 else:
                     self.binary_paths["python"] = [shutil.which("salt"), "shell"]
                     if platform.is_darwin():

From 54b6e4144612c624ed38967e38a179b847b9405f Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Wed, 30 Aug 2023 11:44:59 -0400
Subject: [PATCH 42/65] just run `cat` instead of `ls -lah`, there are escaping
 problems on tiamat macos packages

---
 pkg/tests/integration/test_salt_exec.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkg/tests/integration/test_salt_exec.py b/pkg/tests/integration/test_salt_exec.py
index 78b8cbd9b4e..6421f6a6f6e 100644
--- a/pkg/tests/integration/test_salt_exec.py
+++ b/pkg/tests/integration/test_salt_exec.py
@@ -7,15 +7,22 @@ pytestmark = [
 ]
 
 
-def test_salt_cmd_run(salt_cli, salt_minion):
+@pytest.fixture
+def cat_file(tmp_path):
+    fp = tmp_path / "cat-file"
+    fp.write_text(fp)
+    return fp
+
+
+def test_salt_cmd_run(salt_cli, salt_minion, cat_file):
     """
-    Test salt cmd.run 'ipconfig' or 'ls -lah /'
+    Test salt cmd.run 'ipconfig' or 'cat <file>'
     """
     ret = None
     if platform.startswith("win"):
         ret = salt_cli.run("cmd.run", "ipconfig", minion_tgt=salt_minion.id)
     else:
-        ret = salt_cli.run("cmd.run", "\\'ls -lah /\\'", minion_tgt=salt_minion.id)
+        ret = salt_cli.run("cmd.run", f"cat {str(cat_file)}", minion_tgt=salt_minion.id)
     assert ret
     assert ret.stdout
 

From 226880e7c61fb6614e966118e592f21d9ed1cbaa Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Wed, 30 Aug 2023 14:38:39 -0400
Subject: [PATCH 43/65] Only test the symlink creation on non-classic builds

---
 pkg/tests/integration/test_version.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkg/tests/integration/test_version.py b/pkg/tests/integration/test_version.py
index d1893b3f2c6..2c3c539ca40 100644
--- a/pkg/tests/integration/test_version.py
+++ b/pkg/tests/integration/test_version.py
@@ -94,7 +94,9 @@ def test_symlinks_created(version, symlink, install_salt):
     """
     Test symlinks created
     """
-    if not install_salt.classic and not install_salt.relenv and symlink == "spm":
+    if install_salt.classic:
+        pytest.skip("Symlinks not created for classic macos builds, we adjust the path")
+    if not install_salt.relenv and symlink == "spm":
         symlink = "salt-spm"
     ret = install_salt.proc.run(pathlib.Path("/usr/local/sbin") / symlink, "--version")
     ret.stdout.matcher.fnmatch_lines([f"*{version}*"])

From bca1e4af01946bb7bd246f79223802f34b2fc691 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Wed, 30 Aug 2023 17:07:37 -0400
Subject: [PATCH 44/65] Get the classic mac packages to find the binaries

---
 pkg/tests/support/helpers.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py
index a9bb72e4815..5ab5a59d124 100644
--- a/pkg/tests/support/helpers.py
+++ b/pkg/tests/support/helpers.py
@@ -1198,11 +1198,7 @@ class PkgMixin:
     salt_pkg_install: SaltPkgInstall = attr.ib()
 
     def get_script_path(self):
-        if (
-            platform.is_darwin()
-            and self.salt_pkg_install.classic
-            and self.salt_pkg_install.upgrade
-        ):
+        if platform.is_darwin() and self.salt_pkg_install.classic:
             if self.salt_pkg_install.run_root and os.path.exists(
                 self.salt_pkg_install.run_root
             ):

From 7003b5d16801fc853dc0548896ba81f3019ab943 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Thu, 31 Aug 2023 11:04:01 -0400
Subject: [PATCH 45/65] Write the string of the path to the cat file

---
 pkg/tests/integration/test_salt_exec.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/tests/integration/test_salt_exec.py b/pkg/tests/integration/test_salt_exec.py
index 6421f6a6f6e..2e28999d7c3 100644
--- a/pkg/tests/integration/test_salt_exec.py
+++ b/pkg/tests/integration/test_salt_exec.py
@@ -10,7 +10,7 @@ pytestmark = [
 @pytest.fixture
 def cat_file(tmp_path):
     fp = tmp_path / "cat-file"
-    fp.write_text(fp)
+    fp.write_text(str(fp))
     return fp
 
 

From 688378fdfb2d50de62d8282c8fb3b292f9242c90 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Thu, 31 Aug 2023 12:14:24 -0400
Subject: [PATCH 46/65] Fix no pip binary for macos classic package tests

---
 pkg/tests/support/helpers.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py
index 5ab5a59d124..36a52093c51 100644
--- a/pkg/tests/support/helpers.py
+++ b/pkg/tests/support/helpers.py
@@ -326,10 +326,6 @@ class SaltPkgInstall:
                     "python": [str(pathlib.Path("/usr/bin/python3"))],
                 }
                 if self.classic:
-                    self.binary_paths["pip"] = [str(pathlib.Path("/usr/bin/pip3"))]
-                    self.proc.run(
-                        *self.binary_paths["pip"], "install", "-U", "pyopenssl"
-                    )
                     if platform.is_darwin():
                         # `which` is not catching the right paths on downgrades, explicitly defining them here
                         self.binary_paths = {
@@ -348,6 +344,10 @@ class SaltPkgInstall:
                             "spm": [self.bin_dir / "spm"],
                             "python": [str(pathlib.Path("/usr/bin/python3"))],
                         }
+                    self.binary_paths["pip"] = [str(pathlib.Path("/usr/bin/pip3"))]
+                    self.proc.run(
+                        *self.binary_paths["pip"], "install", "-U", "pyopenssl"
+                    )
                 else:
                     self.binary_paths["python"] = [shutil.which("salt"), "shell"]
                     if platform.is_darwin():

From 588ff0eb62b9f359d21cb0fa99a4ac4167a8de5b Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Thu, 31 Aug 2023 13:27:40 -0400
Subject: [PATCH 47/65] Fix pip and python binary for classic macos packages

---
 pkg/tests/support/helpers.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py
index 36a52093c51..c5e1286af0e 100644
--- a/pkg/tests/support/helpers.py
+++ b/pkg/tests/support/helpers.py
@@ -342,12 +342,14 @@ class SaltPkgInstall:
                             "ssh": [self.bin_dir / "salt-ssh"],
                             "syndic": [self.bin_dir / "salt-syndic"],
                             "spm": [self.bin_dir / "spm"],
-                            "python": [str(pathlib.Path("/usr/bin/python3"))],
+                            "python": [str(self.bin_dir / "python3")],
+                            "pip": [str(self.bin_dir / "pip3")],
                         }
-                    self.binary_paths["pip"] = [str(pathlib.Path("/usr/bin/pip3"))]
-                    self.proc.run(
-                        *self.binary_paths["pip"], "install", "-U", "pyopenssl"
-                    )
+                    else:
+                        self.binary_paths["pip"] = [str(pathlib.Path("/usr/bin/pip3"))]
+                        self.proc.run(
+                            *self.binary_paths["pip"], "install", "-U", "pyopenssl"
+                        )
                 else:
                     self.binary_paths["python"] = [shutil.which("salt"), "shell"]
                     if platform.is_darwin():

From 9114e86da0d0ab2be0538a65fb00d56ce5e6595e Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Tue, 5 Sep 2023 15:58:26 -0400
Subject: [PATCH 48/65] Fix centosstream 8 classic downgrade tests

---
 pkg/tests/support/helpers.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py
index c5e1286af0e..fa79b8b38dc 100644
--- a/pkg/tests/support/helpers.py
+++ b/pkg/tests/support/helpers.py
@@ -531,10 +531,22 @@ class SaltPkgInstall:
             ret = self.proc.run(self.pkg_mngr, "clean", "expire-cache")
             self._check_retcode(ret)
             cmd_action = "downgrade" if downgrade else "install"
+            pkgs_to_install = self.salt_pkgs.copy()
+            if self.distro_version == "8" and self.classic:
+                # centosstream 8 doesn't downgrade properly using the downgrade command for some reason
+                # So we explicitly install the correct version here
+                list_ret = self.proc.run(
+                    self.pkg_mngr, "list", "--available", "salt"
+                ).stdout.split("\n")
+                list_ret = [_.strip() for _ in list_ret]
+                idx = list_ret.index("Available Packages")
+                old_ver = list_ret[idx + 1].split()[1]
+                pkgs_to_install = [f"{pkg}-{old_ver}" for pkg in pkgs_to_install]
+                cmd_action = "install"
             ret = self.proc.run(
                 self.pkg_mngr,
                 cmd_action,
-                *self.salt_pkgs,
+                *pkgs_to_install,
                 "-y",
             )
             self._check_retcode(ret)

From b867063395382a06c671f91922105e3f6d4e697c Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Wed, 6 Sep 2023 12:47:35 -0400
Subject: [PATCH 49/65] Don't run `--help` on `salt-proxy` script for classic
 macos packages, it doesn't work for now

---
 pkg/tests/integration/test_help.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkg/tests/integration/test_help.py b/pkg/tests/integration/test_help.py
index b5070638fe2..973b5efc2df 100644
--- a/pkg/tests/integration/test_help.py
+++ b/pkg/tests/integration/test_help.py
@@ -1,5 +1,7 @@
 import subprocess
 
+from pytestskipmarkers.utils import platform
+
 
 def test_help(install_salt):
     """
@@ -12,6 +14,10 @@ def test_help(install_salt):
             # Singlebin build, unable to get the version
             continue
 
+        # TODO: Remove this condition once the fixed 3005.x classic packages are released.
+        if "salt-proxy" in cmd[0] and platform.is_darwin() and install_salt.classic:
+            continue
+
         if "python" in cmd[0] and len(cmd) == 1:
             ret = install_salt.proc.run(
                 *cmd, "--version", stdout=subprocess.PIPE, stderr=subprocess.PIPE

From 1d1b0205c38e18105754ef38e0b3e75095b1c413 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Wed, 6 Sep 2023 18:42:12 -0400
Subject: [PATCH 50/65] Attempt to fix debian 10 classic packages not being
 able to install PyGithub

---
 pkg/tests/integration/test_pip.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkg/tests/integration/test_pip.py b/pkg/tests/integration/test_pip.py
index fa20962aa8b..974d64353cb 100644
--- a/pkg/tests/integration/test_pip.py
+++ b/pkg/tests/integration/test_pip.py
@@ -42,7 +42,7 @@ def wipe_pydeps(shell, install_salt, extras_pypath):
             shutil.rmtree(dirname, ignore_errors=True)
 
 
-def test_pip_install(salt_call_cli, install_salt):
+def test_pip_install(salt_call_cli, install_salt, shell):
     """
     Test pip.install and ensure module can use installed library
     """
@@ -50,6 +50,15 @@ def test_pip_install(salt_call_cli, install_salt):
     repo = "https://github.com/saltstack/salt.git"
 
     try:
+        if (
+            install_salt.classic
+            and install_salt.distro_id == "debian"
+            and install_salt.distro_version == "10"
+        ):
+            pip_upgrade = salt_call_cli.run(
+                "--local", "pip.install", "pip", "upgrade=True"
+            )
+            assert pip_upgrade.returncode == 0
         install = salt_call_cli.run("--local", "pip.install", dep)
         assert install.returncode == 0
 

From f560451d34194f697ea1e7ba0248d95d10dfa0c9 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Thu, 7 Sep 2023 12:32:59 -0400
Subject: [PATCH 51/65] Update pip before pyopenssl in cases where it is needed

---
 pkg/tests/integration/test_pip.py | 9 ---------
 pkg/tests/support/helpers.py      | 1 +
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/pkg/tests/integration/test_pip.py b/pkg/tests/integration/test_pip.py
index 974d64353cb..d6102c431e3 100644
--- a/pkg/tests/integration/test_pip.py
+++ b/pkg/tests/integration/test_pip.py
@@ -50,15 +50,6 @@ def test_pip_install(salt_call_cli, install_salt, shell):
     repo = "https://github.com/saltstack/salt.git"
 
     try:
-        if (
-            install_salt.classic
-            and install_salt.distro_id == "debian"
-            and install_salt.distro_version == "10"
-        ):
-            pip_upgrade = salt_call_cli.run(
-                "--local", "pip.install", "pip", "upgrade=True"
-            )
-            assert pip_upgrade.returncode == 0
         install = salt_call_cli.run("--local", "pip.install", dep)
         assert install.returncode == 0
 
diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py
index fa79b8b38dc..021b99676ee 100644
--- a/pkg/tests/support/helpers.py
+++ b/pkg/tests/support/helpers.py
@@ -347,6 +347,7 @@ class SaltPkgInstall:
                         }
                     else:
                         self.binary_paths["pip"] = [str(pathlib.Path("/usr/bin/pip3"))]
+                        self.proc.run(*self.binary_paths["pip"], "install", "-U", "pip")
                         self.proc.run(
                             *self.binary_paths["pip"], "install", "-U", "pyopenssl"
                         )

From b52f1b3b609ff7500132b859205c1cdeeaa86284 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Fri, 8 Sep 2023 11:17:31 -0400
Subject: [PATCH 52/65] Update breaks statements to be `<=3006.3`

---
 pkg/debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/debian/control b/pkg/debian/control
index da618374fed..0ad39d1d9c0 100644
--- a/pkg/debian/control
+++ b/pkg/debian/control
@@ -131,7 +131,7 @@ Description: master-of-masters for salt, the distributed remote execution system
 
 Package: salt-ssh
 Architecture: amd64 arm64
-Breaks: salt-common (<= 3006.2)
+Breaks: salt-common (<= 3006.3)
 Depends: salt-common (= ${source:Version}),
          openssh-client,
          ${misc:Depends}
@@ -160,7 +160,7 @@ Description: remote manager to administer servers via Salt SSH
 
 Package: salt-cloud
 Architecture: amd64 arm64
-Breaks: salt-common (<= 3006.2)
+Breaks: salt-common (<= 3006.3)
 Depends: salt-common (= ${source:Version}),
          ${misc:Depends}
 Description: public cloud VM management system

From d9bfb7b7bbc693e05e73d472286d15fe340037d5 Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Fri, 8 Sep 2023 15:14:40 -0400
Subject: [PATCH 53/65] Address review comments, hiding non-important fixtures
 and removing a basically blank method

---
 pkg/tests/integration/test_clean_zmq_teardown.py | 2 +-
 pkg/tests/integration/test_multi_minion.py       | 2 +-
 pkg/tests/integration/test_salt_user.py          | 2 +-
 pkg/tests/support/helpers.py                     | 7 +------
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkg/tests/integration/test_clean_zmq_teardown.py b/pkg/tests/integration/test_clean_zmq_teardown.py
index b85897ac5d5..309493e69aa 100644
--- a/pkg/tests/integration/test_clean_zmq_teardown.py
+++ b/pkg/tests/integration/test_clean_zmq_teardown.py
@@ -13,7 +13,7 @@ log = logging.getLogger(__name__)
 
 
 @pytest.fixture(autouse=True)
-def skip_on_non_relenv(install_salt):
+def _skip_on_non_relenv(install_salt):
     if not install_salt.relenv:
         pytest.skip("This test is for relenv versions of salt")
 
diff --git a/pkg/tests/integration/test_multi_minion.py b/pkg/tests/integration/test_multi_minion.py
index 923ad6eecc6..c8f0659a684 100644
--- a/pkg/tests/integration/test_multi_minion.py
+++ b/pkg/tests/integration/test_multi_minion.py
@@ -12,7 +12,7 @@ pytestmark = [
 
 
 @pytest.fixture(autouse=True)
-def skip_on_less_than_3006_1(install_salt):
+def _skip_on_less_than_3006_1(install_salt):
     if packaging.version.parse(install_salt.version) <= packaging.version.parse(
         "3006.1"
     ):
diff --git a/pkg/tests/integration/test_salt_user.py b/pkg/tests/integration/test_salt_user.py
index 5b1f426c560..9d2634962be 100644
--- a/pkg/tests/integration/test_salt_user.py
+++ b/pkg/tests/integration/test_salt_user.py
@@ -61,7 +61,7 @@ def pkg_paths_salt_user_exclusions():
 
 
 @pytest.fixture(autouse=True)
-def skip_on_non_relenv(install_salt):
+def _skip_on_non_relenv(install_salt):
     if not install_salt.relenv:
         pytest.skip("The salt user only exists on relenv versions of salt")
 
diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py
index 021b99676ee..79724d95cd4 100644
--- a/pkg/tests/support/helpers.py
+++ b/pkg/tests/support/helpers.py
@@ -216,7 +216,7 @@ class SaltPkgInstall:
         if platform.is_windows():
             file_ext_re = "exe|msi"
 
-        for f_path in ARTIFACTS_DIR.glob("**/*.*"):
+        for f_path in ARTIFACTS_DIR.rglob("."):
             f_path = str(f_path)
             if re.search(f"salt-(.*).({file_ext_re})$", f_path, re.IGNORECASE):
                 self.file_ext = os.path.splitext(f_path)[1].strip(".")
@@ -1224,11 +1224,6 @@ class PkgMixin:
                 return str(self.salt_pkg_install.install_dir / self.script_name)
         return super().get_script_path()
 
-    def get_base_script_args(self):
-        base_script_args = []
-        base_script_args.extend(super().get_base_script_args())
-        return base_script_args
-
     def cmdline(self, *args, **kwargs):
         _cmdline = super().cmdline(*args, **kwargs)
         if _cmdline[0] == self.python_executable:

From 288d650a6c64d35f2fdf2ead5c4087afcb55239a Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Fri, 8 Sep 2023 16:30:02 -0400
Subject: [PATCH 54/65] Revert artifact dir glob

---
 pkg/tests/support/helpers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/tests/support/helpers.py b/pkg/tests/support/helpers.py
index 79724d95cd4..91b6bf0fb5e 100644
--- a/pkg/tests/support/helpers.py
+++ b/pkg/tests/support/helpers.py
@@ -216,7 +216,7 @@ class SaltPkgInstall:
         if platform.is_windows():
             file_ext_re = "exe|msi"
 
-        for f_path in ARTIFACTS_DIR.rglob("."):
+        for f_path in ARTIFACTS_DIR.glob("**/*.*"):
             f_path = str(f_path)
             if re.search(f"salt-(.*).({file_ext_re})$", f_path, re.IGNORECASE):
                 self.file_ext = os.path.splitext(f_path)[1].strip(".")

From c3477da2ddb81509b4e2c550ea36497c0b05709c Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <palgarvio@vmware.com>
Date: Mon, 11 Sep 2023 09:40:35 +0100
Subject: [PATCH 55/65] The 3006.x branch is Python >= 3.7 already. Remove
 unnecessary `python_version` markers.

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
---
 requirements/darwin.txt                          |  3 +--
 requirements/pytest.txt                          |  3 +--
 requirements/static/ci/common.in                 | 12 +++++-------
 requirements/static/ci/darwin.in                 |  2 +-
 requirements/static/ci/freebsd.in                |  2 +-
 requirements/static/ci/linux.in                  |  6 ++----
 requirements/static/ci/pkgtests-windows.in       |  3 +--
 requirements/static/ci/py3.10/cloud.txt          | 10 +++++-----
 requirements/static/ci/py3.10/darwin.txt         | 12 ++++++------
 requirements/static/ci/py3.10/freebsd.txt        | 12 ++++++------
 requirements/static/ci/py3.10/lint.txt           | 12 ++++++------
 requirements/static/ci/py3.10/linux.txt          | 14 +++++++-------
 .../static/ci/py3.10/pkgtests-windows.txt        |  2 +-
 requirements/static/ci/py3.10/windows.txt        | 12 ++++++------
 requirements/static/ci/py3.7/cloud.txt           | 12 ++++++------
 requirements/static/ci/py3.7/freebsd.txt         | 14 +++++++-------
 requirements/static/ci/py3.7/lint.txt            | 14 +++++++-------
 requirements/static/ci/py3.7/linux.txt           | 16 ++++++++--------
 requirements/static/ci/py3.7/windows.txt         | 12 ++++++------
 requirements/static/ci/py3.8/cloud.txt           | 12 ++++++------
 requirements/static/ci/py3.8/freebsd.txt         | 14 +++++++-------
 requirements/static/ci/py3.8/lint.txt            | 14 +++++++-------
 requirements/static/ci/py3.8/linux.txt           | 16 ++++++++--------
 requirements/static/ci/py3.8/windows.txt         | 12 ++++++------
 requirements/static/ci/py3.9/cloud.txt           | 12 ++++++------
 requirements/static/ci/py3.9/darwin.txt          | 14 +++++++-------
 requirements/static/ci/py3.9/freebsd.txt         | 14 +++++++-------
 requirements/static/ci/py3.9/lint.txt            | 14 +++++++-------
 requirements/static/ci/py3.9/linux.txt           | 16 ++++++++--------
 requirements/static/ci/py3.9/windows.txt         | 12 ++++++------
 requirements/static/ci/windows.in                |  2 +-
 requirements/static/pkg/freebsd.in               |  1 -
 requirements/static/pkg/linux.in                 |  1 -
 requirements/static/pkg/py3.10/darwin.txt        |  2 +-
 requirements/static/pkg/py3.10/windows.txt       |  2 +-
 requirements/static/pkg/py3.7/windows.txt        |  2 +-
 requirements/static/pkg/py3.8/windows.txt        |  2 +-
 requirements/static/pkg/py3.9/darwin.txt         |  2 +-
 requirements/static/pkg/py3.9/windows.txt        |  2 +-
 requirements/windows.txt                         |  3 +--
 40 files changed, 166 insertions(+), 176 deletions(-)

diff --git a/requirements/darwin.txt b/requirements/darwin.txt
index 2b0106ba9d1..59aa84bc06e 100644
--- a/requirements/darwin.txt
+++ b/requirements/darwin.txt
@@ -3,10 +3,9 @@
 -r zeromq.txt
 
 apache-libcloud>=2.4.0
-backports.ssl_match_hostname>=3.7.0.1; python_version < '3.7'
 cherrypy>=17.4.1
 cryptography>=41.0.3
-gitpython>=3.1.30; python_version >= '3.7'
+gitpython>=3.1.30
 idna>=2.8
 linode-python>=1.1.1
 pyasn1>=0.4.8
diff --git a/requirements/pytest.txt b/requirements/pytest.txt
index 5b67583a3d7..5940ca1f2c7 100644
--- a/requirements/pytest.txt
+++ b/requirements/pytest.txt
@@ -1,7 +1,6 @@
 mock >= 3.0.0
 # PyTest
-pytest >= 7.0.1; python_version <= "3.6"
-pytest >= 7.2.0; python_version > "3.6"
+pytest >= 7.2.0
 pytest-salt-factories >= 1.0.0rc21; sys_platform == 'win32'
 pytest-salt-factories[docker] >= 1.0.0rc21; sys_platform != 'win32'
 pytest-tempdir >= 2019.10.12
diff --git a/requirements/static/ci/common.in b/requirements/static/ci/common.in
index 4e55fb95f10..ac54d8ee9e7 100644
--- a/requirements/static/ci/common.in
+++ b/requirements/static/ci/common.in
@@ -3,8 +3,7 @@
 # to a particular platform, please add it to the corresponding `<platform>.in` file in this directory.
 azure==4.0.0; sys_platform != 'win32'
 apache-libcloud>=1.5.0; sys_platform != 'win32'
-boto3>=1.16.0,<1.17.0; python_version < '3.6'
-boto3>=1.17.67; python_version >= '3.6'
+boto3>=1.17.67
 boto>=2.46.0
 cassandra-driver>=2.0
 certifi>=2022.12.07
@@ -14,8 +13,8 @@ clustershell
 croniter>=0.3.0,!=0.3.22"; sys_platform != 'win32'
 dnspython
 docker
-etcd3-py==0.1.6 ; python_version >= '3.6'
-gitpython>=3.1.30; python_version >= '3.7'
+etcd3-py==0.1.6
+gitpython>=3.1.30
 jmespath
 jsonschema
 junos-eznc; sys_platform != 'win32' and python_version <= '3.10'
@@ -24,10 +23,9 @@ kazoo; sys_platform != 'win32' and sys_platform != 'darwin'
 keyring==5.7.1
 kubernetes<4.0
 libnacl>=1.7.1; sys_platform != 'win32' and sys_platform != 'darwin'
-moto>=1.3.14 ; python_version <= '3.5'
-moto>=2.0.0 ; python_version >= '3.6'
+moto>=2.0.0
 # Napalm pulls in pyeapi which does not work on Py3.10
-napalm; sys_platform != 'win32' and python_version > '3.6'  and python_version < '3.10'
+napalm; sys_platform != 'win32' and python_version < '3.10'
 paramiko>=2.10.1; sys_platform != 'win32' and sys_platform != 'darwin'
 passlib[bcrypt]>=1.7.4
 pynacl>=1.5.0
diff --git a/requirements/static/ci/darwin.in b/requirements/static/ci/darwin.in
index d7b8f010e0f..9ab7e15587a 100644
--- a/requirements/static/ci/darwin.in
+++ b/requirements/static/ci/darwin.in
@@ -3,7 +3,7 @@
 # pylxd(or likely ws4py) will cause the test suite to hang at the finish line under runtests.py
 # pylxd>=2.2.5
 yamlordereddictloader
-pygit2>=1.2.0; python_version >= '3.7'
+pygit2>=1.2.0
 yamllint
 mercurial
 hglib
diff --git a/requirements/static/ci/freebsd.in b/requirements/static/ci/freebsd.in
index 20f88c8724a..00f34fddee4 100644
--- a/requirements/static/ci/freebsd.in
+++ b/requirements/static/ci/freebsd.in
@@ -1,5 +1,5 @@
 # FreeBSD static CI requirements
-pygit2==1.8.0; python_version >= '3.7'
+pygit2==1.8.0
 yamllint
 mercurial
 hglib
diff --git a/requirements/static/ci/linux.in b/requirements/static/ci/linux.in
index c05c78de1e5..a76d02ccc5c 100644
--- a/requirements/static/ci/linux.in
+++ b/requirements/static/ci/linux.in
@@ -3,13 +3,11 @@ pyiface
 pygit2<1.1.0; python_version <= '3.8'
 pygit2>=1.4.0; python_version > '3.8'
 pygit2==1.9.1; python_version >= '3.10'
-pymysql==0.9.3; python_version <= '3.5'
-pymysql>=1.0.2; python_version > '3.5'
+pymysql>=1.0.2
 ansible>=4.4.0; python_version < '3.9'
 ansible>=7.0.0; python_version >= '3.9'
 twilio
-python-telegram-bot==12.8; python_version <= '3.5'
-python-telegram-bot>=13.7; python_version > '3.5'
+python-telegram-bot>=13.7
 yamllint
 mercurial
 hglib
diff --git a/requirements/static/ci/pkgtests-windows.in b/requirements/static/ci/pkgtests-windows.in
index f34edda6f04..53cdcf3e5fc 100644
--- a/requirements/static/ci/pkgtests-windows.in
+++ b/requirements/static/ci/pkgtests-windows.in
@@ -1,5 +1,4 @@
 cherrypy
 pytest-salt-factories==1.0.0rc17
-pythonnet==3.0.1; python_version >= '3.7'
-pythonnet==2.5.2; python_version < '3.7'
+pythonnet==3.0.1
 wmi==1.5.1; sys_platform == 'win32'
diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt
index d824ccaef96..0fd1d6fb3db 100644
--- a/requirements/static/ci/py3.10/cloud.txt
+++ b/requirements/static/ci/py3.10/cloud.txt
@@ -335,7 +335,7 @@ bcrypt==3.2.0
     # via
     #   paramiko
     #   passlib
-boto3==1.21.46 ; python_version >= "3.6"
+boto3==1.21.46
     # via
     #   -r requirements/static/ci/common.in
     #   moto
@@ -414,7 +414,7 @@ docker==5.0.2
     # via
     #   -r requirements/static/ci/common.in
     #   pytest-salt-factories
-etcd3-py==0.1.6 ; python_version >= "3.6"
+etcd3-py==0.1.6
     # via -r requirements/static/ci/common.in
 exceptiongroup==1.0.4
     # via pytest
@@ -432,7 +432,7 @@ geomet==0.2.1.post1
     # via cassandra-driver
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32 ; python_version >= "3.7"
+gitpython==3.1.32
     # via -r requirements/static/ci/common.in
 google-auth==2.1.0
     # via kubernetes
@@ -510,7 +510,7 @@ more-itertools==8.8.0
     #   cherrypy
     #   jaraco.classes
     #   jaraco.functools
-moto==3.0.1 ; python_version >= "3.6"
+moto==3.0.1
     # via -r requirements/static/ci/common.in
 msgpack==1.0.2
     # via
@@ -717,7 +717,7 @@ pytest-tempdir==2019.10.12
     #   pytest-salt-factories
 pytest-timeout==2.0.2
     # via -r requirements/pytest.txt
-pytest==7.2.0 ; python_version > "3.6"
+pytest==7.2.0
     # via
     #   -r requirements/pytest.txt
     #   pytest-custom-exit-code
diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt
index 84d153a310b..8e43b9a0371 100644
--- a/requirements/static/ci/py3.10/darwin.txt
+++ b/requirements/static/ci/py3.10/darwin.txt
@@ -335,7 +335,7 @@ bcrypt==3.1.6
     # via
     #   paramiko
     #   passlib
-boto3==1.21.46 ; python_version >= "3.6"
+boto3==1.21.46
     # via
     #   -r requirements/static/ci/common.in
     #   moto
@@ -412,7 +412,7 @@ docker==5.0.3
     # via
     #   -r requirements/static/ci/common.in
     #   pytest-salt-factories
-etcd3-py==0.1.6 ; python_version >= "3.6"
+etcd3-py==0.1.6
     # via -r requirements/static/ci/common.in
 exceptiongroup==1.0.4
     # via pytest
@@ -430,7 +430,7 @@ geomet==0.1.2
     # via cassandra-driver
 gitdb==4.0.5
     # via gitpython
-gitpython==3.1.32 ; python_version >= "3.7"
+gitpython==3.1.32
     # via
     #   -r requirements/darwin.txt
     #   -r requirements/static/ci/common.in
@@ -513,7 +513,7 @@ more-itertools==8.2.0
     #   cherrypy
     #   jaraco.classes
     #   jaraco.functools
-moto==3.0.1 ; python_version >= "3.6"
+moto==3.0.1
     # via -r requirements/static/ci/common.in
 msgpack==1.0.2
     # via
@@ -664,7 +664,7 @@ pycparser==2.21 ; python_version >= "3.9"
     #   cffi
 pycryptodomex==3.9.8
     # via -r requirements/crypto.txt
-pygit2==1.9.1 ; python_version >= "3.7"
+pygit2==1.9.1
     # via -r requirements/static/ci/darwin.in
 pyjwt==2.4.0
     # via adal
@@ -712,7 +712,7 @@ pytest-tempdir==2019.10.12
     #   pytest-salt-factories
 pytest-timeout==1.4.2
     # via -r requirements/pytest.txt
-pytest==7.2.0 ; python_version > "3.6"
+pytest==7.2.0
     # via
     #   -r requirements/pytest.txt
     #   pytest-custom-exit-code
diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt
index e4ac6666cad..b17de0c8156 100644
--- a/requirements/static/ci/py3.10/freebsd.txt
+++ b/requirements/static/ci/py3.10/freebsd.txt
@@ -333,7 +333,7 @@ bcrypt==3.1.6
     # via
     #   paramiko
     #   passlib
-boto3==1.21.46 ; python_version >= "3.6"
+boto3==1.21.46
     # via
     #   -r requirements/static/ci/common.in
     #   moto
@@ -411,7 +411,7 @@ docker==5.0.3
     # via
     #   -r requirements/static/ci/common.in
     #   pytest-salt-factories
-etcd3-py==0.1.6 ; python_version >= "3.6"
+etcd3-py==0.1.6
     # via -r requirements/static/ci/common.in
 exceptiongroup==1.0.4
     # via pytest
@@ -429,7 +429,7 @@ geomet==0.2.1.post1
     # via cassandra-driver
 gitdb==4.0.5
     # via gitpython
-gitpython==3.1.32 ; python_version >= "3.7"
+gitpython==3.1.32
     # via -r requirements/static/ci/common.in
 google-auth==1.6.3
     # via kubernetes
@@ -511,7 +511,7 @@ more-itertools==5.0.0
     #   cherrypy
     #   jaraco.classes
     #   jaraco.functools
-moto==3.0.1 ; python_version >= "3.6"
+moto==3.0.1
     # via -r requirements/static/ci/common.in
 msgpack==1.0.2
     # via
@@ -662,7 +662,7 @@ pycparser==2.21 ; python_version >= "3.9"
     #   cffi
 pycryptodomex==3.9.8
     # via -r requirements/crypto.txt
-pygit2==1.8.0 ; python_version >= "3.7"
+pygit2==1.8.0
     # via -r requirements/static/ci/freebsd.in
 pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and platform_system != "openbsd"
     # via -r requirements/static/ci/common.in
@@ -712,7 +712,7 @@ pytest-tempdir==2019.10.12
     #   pytest-salt-factories
 pytest-timeout==1.4.2
     # via -r requirements/pytest.txt
-pytest==7.2.0 ; python_version > "3.6"
+pytest==7.2.0
     # via
     #   -r requirements/pytest.txt
     #   pytest-custom-exit-code
diff --git a/requirements/static/ci/py3.10/lint.txt b/requirements/static/ci/py3.10/lint.txt
index dae28399872..f5a55633c4a 100644
--- a/requirements/static/ci/py3.10/lint.txt
+++ b/requirements/static/ci/py3.10/lint.txt
@@ -336,7 +336,7 @@ bcrypt==3.2.0
     # via
     #   paramiko
     #   passlib
-boto3==1.21.46 ; python_version >= "3.6"
+boto3==1.21.46
     # via
     #   -r requirements/static/ci/common.in
     #   moto
@@ -413,7 +413,7 @@ dnspython==2.1.0
     #   python-etcd
 docker==5.0.0
     # via -r requirements/static/ci/common.in
-etcd3-py==0.1.6 ; python_version >= "3.6"
+etcd3-py==0.1.6
     # via -r requirements/static/ci/common.in
 filelock==3.0.12
     # via virtualenv
@@ -427,7 +427,7 @@ geomet==0.2.1.post1
     # via cassandra-driver
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32 ; python_version >= "3.7"
+gitpython==3.1.32
     # via -r requirements/static/ci/common.in
 google-auth==2.0.1
     # via kubernetes
@@ -514,7 +514,7 @@ more-itertools==8.8.0
     #   cherrypy
     #   jaraco.classes
     #   jaraco.functools
-moto==3.0.1 ; python_version >= "3.6"
+moto==3.0.1
     # via -r requirements/static/ci/common.in
 msgpack==1.0.2
     # via -r requirements/base.txt
@@ -671,7 +671,7 @@ pylint==2.4.4
     # via
     #   -r requirements/static/ci/lint.in
     #   saltpylint
-pymysql==1.0.2 ; python_version > "3.5"
+pymysql==1.0.2
     # via -r requirements/static/ci/linux.in
 pynacl==1.5.0
     # via
@@ -706,7 +706,7 @@ python-etcd==0.4.5
     # via -r requirements/static/ci/common.in
 python-gnupg==0.4.8
     # via -r requirements/static/pkg/linux.in
-python-telegram-bot==13.7 ; python_version > "3.5"
+python-telegram-bot==13.7
     # via -r requirements/static/ci/linux.in
 pytz==2022.1
     # via
diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt
index 35207680b2f..ba85e91fdc9 100644
--- a/requirements/static/ci/py3.10/linux.txt
+++ b/requirements/static/ci/py3.10/linux.txt
@@ -344,7 +344,7 @@ bcrypt==3.1.6
     # via
     #   paramiko
     #   passlib
-boto3==1.21.46 ; python_version >= "3.6"
+boto3==1.21.46
     # via
     #   -r requirements/static/ci/common.in
     #   moto
@@ -425,7 +425,7 @@ docker==5.0.3
     # via
     #   -r requirements/static/ci/common.in
     #   pytest-salt-factories
-etcd3-py==0.1.6 ; python_version >= "3.6"
+etcd3-py==0.1.6
     # via -r requirements/static/ci/common.in
 exceptiongroup==1.0.4
     # via pytest
@@ -443,7 +443,7 @@ geomet==0.1.2
     # via cassandra-driver
 gitdb==4.0.5
     # via gitpython
-gitpython==3.1.32 ; python_version >= "3.7"
+gitpython==3.1.32
     # via -r requirements/static/ci/common.in
 google-auth==1.6.3
     # via kubernetes
@@ -526,7 +526,7 @@ more-itertools==5.0.0
     #   cherrypy
     #   jaraco.classes
     #   jaraco.functools
-moto==3.0.1 ; python_version >= "3.6"
+moto==3.0.1
     # via -r requirements/static/ci/common.in
 msgpack==1.0.2
     # via
@@ -685,7 +685,7 @@ pyjwt==2.4.0
     # via
     #   adal
     #   twilio
-pymysql==1.0.2 ; python_version > "3.5"
+pymysql==1.0.2
     # via -r requirements/static/ci/linux.in
 pynacl==1.5.0
     # via
@@ -729,7 +729,7 @@ pytest-tempdir==2019.10.12
     #   pytest-salt-factories
 pytest-timeout==1.4.2
     # via -r requirements/pytest.txt
-pytest==7.2.0 ; python_version > "3.6"
+pytest==7.2.0
     # via
     #   -r requirements/pytest.txt
     #   pytest-custom-exit-code
@@ -758,7 +758,7 @@ python-etcd==0.4.5
     # via -r requirements/static/ci/common.in
 python-gnupg==0.4.8
     # via -r requirements/static/pkg/linux.in
-python-telegram-bot==13.7 ; python_version > "3.5"
+python-telegram-bot==13.7
     # via -r requirements/static/ci/linux.in
 pytz==2022.1
     # via
diff --git a/requirements/static/ci/py3.10/pkgtests-windows.txt b/requirements/static/ci/py3.10/pkgtests-windows.txt
index de7ee93e182..88e31addbb2 100644
--- a/requirements/static/ci/py3.10/pkgtests-windows.txt
+++ b/requirements/static/ci/py3.10/pkgtests-windows.txt
@@ -128,7 +128,7 @@ pytest==7.2.1
     #   pytest-skip-markers
     #   pytest-system-statistics
     #   pytest-tempdir
-pythonnet==3.0.1 ; python_version >= "3.7"
+pythonnet==3.0.1
     # via -r requirements/static/ci/pkgtests-windows.in
 pytz==2022.7.1
     # via tempora
diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt
index 218a65c8ec7..66bd0d7590c 100644
--- a/requirements/static/ci/py3.10/windows.txt
+++ b/requirements/static/ci/py3.10/windows.txt
@@ -21,7 +21,7 @@ attrs==20.3.0
     #   pytest-system-statistics
 bcrypt==4.0.1
     # via passlib
-boto3==1.21.46 ; python_version >= "3.6"
+boto3==1.21.46
     # via
     #   -r requirements/static/ci/common.in
     #   moto
@@ -95,7 +95,7 @@ docker-pycreds==0.4.0
     # via docker
 docker==2.7.0
     # via -r requirements/static/ci/common.in
-etcd3-py==0.1.6 ; python_version >= "3.6"
+etcd3-py==0.1.6
     # via -r requirements/static/ci/common.in
 exceptiongroup==1.0.4
     # via pytest
@@ -113,7 +113,7 @@ geomet==0.1.2
     # via cassandra-driver
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32 ; python_version >= "3.7"
+gitpython==3.1.32
     # via
     #   -r requirements/static/ci/common.in
     #   -r requirements/windows.txt
@@ -182,7 +182,7 @@ more-itertools==8.2.0
     #   cherrypy
     #   jaraco.classes
     #   jaraco.functools
-moto==3.0.1 ; python_version >= "3.6"
+moto==3.0.1
     # via -r requirements/static/ci/common.in
 msgpack==1.0.2
     # via
@@ -232,7 +232,7 @@ pycparser==2.21 ; python_version >= "3.9"
     #   cffi
 pycryptodomex==3.10.1
     # via -r requirements/crypto.txt
-pygit2==1.9.1 ; python_version >= "3.7"
+pygit2==1.9.1
     # via -r requirements/static/ci/windows.in
 pymssql==2.2.7
     # via -r requirements/windows.txt
@@ -276,7 +276,7 @@ pytest-tempdir==2019.10.12
     #   pytest-salt-factories
 pytest-timeout==2.1.0
     # via -r requirements/pytest.txt
-pytest==7.2.0 ; python_version > "3.6"
+pytest==7.2.0
     # via
     #   -r requirements/pytest.txt
     #   pytest-custom-exit-code
diff --git a/requirements/static/ci/py3.7/cloud.txt b/requirements/static/ci/py3.7/cloud.txt
index 17d3dba3318..84a48dd4102 100644
--- a/requirements/static/ci/py3.7/cloud.txt
+++ b/requirements/static/ci/py3.7/cloud.txt
@@ -337,7 +337,7 @@ bcrypt==3.2.0
     # via
     #   paramiko
     #   passlib
-boto3==1.21.46 ; python_version >= "3.6"
+boto3==1.21.46
     # via
     #   -r requirements/static/ci/common.in
     #   moto
@@ -422,7 +422,7 @@ docker==5.0.2
     # via
     #   -r requirements/static/ci/common.in
     #   pytest-salt-factories
-etcd3-py==0.1.6 ; python_version >= "3.6"
+etcd3-py==0.1.6
     # via -r requirements/static/ci/common.in
 exceptiongroup==1.0.4
     # via pytest
@@ -444,7 +444,7 @@ geomet==0.2.1.post1
     # via cassandra-driver
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32 ; python_version >= "3.7"
+gitpython==3.1.32
     # via -r requirements/static/ci/common.in
 google-auth==2.1.0
     # via kubernetes
@@ -537,7 +537,7 @@ more-itertools==8.8.0
     #   cherrypy
     #   jaraco.classes
     #   jaraco.functools
-moto==3.0.1 ; python_version >= "3.6"
+moto==3.0.1
     # via -r requirements/static/ci/common.in
 msgpack==1.0.2
     # via
@@ -639,7 +639,7 @@ multidict==6.0.2
     # via
     #   aiohttp
     #   yarl
-napalm==3.3.1 ; sys_platform != "win32" and python_version > "3.6" and python_version < "3.10"
+napalm==3.3.1 ; sys_platform != "win32" and python_version < "3.10"
     # via -r requirements/static/ci/common.in
 ncclient==0.6.12
     # via
@@ -761,7 +761,7 @@ pytest-tempdir==2019.10.12
     #   pytest-salt-factories
 pytest-timeout==2.0.2
     # via -r requirements/pytest.txt
-pytest==7.2.0 ; python_version > "3.6"
+pytest==7.2.0
     # via
     #   -r requirements/pytest.txt
     #   pytest-custom-exit-code
diff --git a/requirements/static/ci/py3.7/freebsd.txt b/requirements/static/ci/py3.7/freebsd.txt
index 9842a5c61e8..6378d6f687b 100644
--- a/requirements/static/ci/py3.7/freebsd.txt
+++ b/requirements/static/ci/py3.7/freebsd.txt
@@ -335,7 +335,7 @@ bcrypt==3.1.6
     # via
     #   paramiko
     #   passlib
-boto3==1.21.46 ; python_version >= "3.6"
+boto3==1.21.46
     # via
     #   -r requirements/static/ci/common.in
     #   moto
@@ -419,7 +419,7 @@ docker==5.0.3
     # via
     #   -r requirements/static/ci/common.in
     #   pytest-salt-factories
-etcd3-py==0.1.6 ; python_version >= "3.6"
+etcd3-py==0.1.6
     # via -r requirements/static/ci/common.in
 exceptiongroup==1.0.4
     # via pytest
@@ -441,7 +441,7 @@ geomet==0.2.1.post1
     # via cassandra-driver
 gitdb==4.0.5
     # via gitpython
-gitpython==3.1.32 ; python_version >= "3.7"
+gitpython==3.1.32
     # via -r requirements/static/ci/common.in
 google-auth==1.6.3
     # via kubernetes
@@ -535,7 +535,7 @@ more-itertools==5.0.0
     #   cherrypy
     #   jaraco.classes
     #   jaraco.functools
-moto==3.0.1 ; python_version >= "3.6"
+moto==3.0.1
     # via -r requirements/static/ci/common.in
 msgpack==1.0.2
     # via
@@ -637,7 +637,7 @@ multidict==6.0.2
     # via
     #   aiohttp
     #   yarl
-napalm==3.1.0 ; sys_platform != "win32" and python_version > "3.6" and python_version < "3.10"
+napalm==3.1.0 ; sys_platform != "win32" and python_version < "3.10"
     # via -r requirements/static/ci/common.in
 ncclient==0.6.4
     # via junos-eznc
@@ -698,7 +698,7 @@ pycryptodomex==3.9.8
     # via -r requirements/crypto.txt
 pyeapi==0.8.3
     # via napalm
-pygit2==1.8.0 ; python_version >= "3.7"
+pygit2==1.8.0
     # via -r requirements/static/ci/freebsd.in
 pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and platform_system != "openbsd"
     # via -r requirements/static/ci/common.in
@@ -750,7 +750,7 @@ pytest-tempdir==2019.10.12
     #   pytest-salt-factories
 pytest-timeout==1.4.2
     # via -r requirements/pytest.txt
-pytest==7.2.0 ; python_version > "3.6"
+pytest==7.2.0
     # via
     #   -r requirements/pytest.txt
     #   pytest-custom-exit-code
diff --git a/requirements/static/ci/py3.7/lint.txt b/requirements/static/ci/py3.7/lint.txt
index 9d08fbbd9fd..0bfa44f611b 100644
--- a/requirements/static/ci/py3.7/lint.txt
+++ b/requirements/static/ci/py3.7/lint.txt
@@ -340,7 +340,7 @@ bcrypt==3.2.0
     # via
     #   paramiko
     #   passlib
-boto3==1.21.46 ; python_version >= "3.6"
+boto3==1.21.46
     # via
     #   -r requirements/static/ci/common.in
     #   moto
@@ -423,7 +423,7 @@ dnspython==2.1.0
     #   python-etcd
 docker==5.0.0
     # via -r requirements/static/ci/common.in
-etcd3-py==0.1.6 ; python_version >= "3.6"
+etcd3-py==0.1.6
     # via -r requirements/static/ci/common.in
 filelock==3.0.12
     # via virtualenv
@@ -441,7 +441,7 @@ geomet==0.2.1.post1
     # via cassandra-driver
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32 ; python_version >= "3.7"
+gitpython==3.1.32
     # via -r requirements/static/ci/common.in
 google-auth==2.0.1
     # via kubernetes
@@ -541,7 +541,7 @@ more-itertools==8.8.0
     #   cherrypy
     #   jaraco.classes
     #   jaraco.functools
-moto==3.0.1 ; python_version >= "3.6"
+moto==3.0.1
     # via -r requirements/static/ci/common.in
 msgpack==1.0.2
     # via -r requirements/base.txt
@@ -641,7 +641,7 @@ multidict==6.0.2
     # via
     #   aiohttp
     #   yarl
-napalm==3.3.1 ; sys_platform != "win32" and python_version > "3.6" and python_version < "3.10"
+napalm==3.3.1 ; sys_platform != "win32" and python_version < "3.10"
     # via -r requirements/static/ci/common.in
 ncclient==0.6.12
     # via
@@ -714,7 +714,7 @@ pylint==2.4.4
     # via
     #   -r requirements/static/ci/lint.in
     #   saltpylint
-pymysql==1.0.2 ; python_version > "3.5"
+pymysql==1.0.2
     # via -r requirements/static/ci/linux.in
 pynacl==1.5.0
     # via
@@ -751,7 +751,7 @@ python-etcd==0.4.5
     # via -r requirements/static/ci/common.in
 python-gnupg==0.4.8
     # via -r requirements/static/pkg/linux.in
-python-telegram-bot==13.7 ; python_version > "3.5"
+python-telegram-bot==13.7
     # via -r requirements/static/ci/linux.in
 pytz==2022.1
     # via
diff --git a/requirements/static/ci/py3.7/linux.txt b/requirements/static/ci/py3.7/linux.txt
index 1712ddc501b..52202b23cd1 100644
--- a/requirements/static/ci/py3.7/linux.txt
+++ b/requirements/static/ci/py3.7/linux.txt
@@ -346,7 +346,7 @@ bcrypt==3.1.6
     # via
     #   paramiko
     #   passlib
-boto3==1.21.46 ; python_version >= "3.6"
+boto3==1.21.46
     # via
     #   -r requirements/static/ci/common.in
     #   moto
@@ -433,7 +433,7 @@ docker==5.0.3
     # via
     #   -r requirements/static/ci/common.in
     #   pytest-salt-factories
-etcd3-py==0.1.6 ; python_version >= "3.6"
+etcd3-py==0.1.6
     # via -r requirements/static/ci/common.in
 exceptiongroup==1.0.4
     # via pytest
@@ -455,7 +455,7 @@ geomet==0.1.2
     # via cassandra-driver
 gitdb==4.0.5
     # via gitpython
-gitpython==3.1.32 ; python_version >= "3.7"
+gitpython==3.1.32
     # via -r requirements/static/ci/common.in
 google-auth==1.6.3
     # via kubernetes
@@ -550,7 +550,7 @@ more-itertools==5.0.0
     #   cherrypy
     #   jaraco.classes
     #   jaraco.functools
-moto==3.0.1 ; python_version >= "3.6"
+moto==3.0.1
     # via -r requirements/static/ci/common.in
 msgpack==1.0.2
     # via
@@ -649,7 +649,7 @@ multidict==6.0.2
     # via
     #   aiohttp
     #   yarl
-napalm==3.1.0 ; sys_platform != "win32" and python_version > "3.6" and python_version < "3.10"
+napalm==3.1.0 ; sys_platform != "win32" and python_version < "3.10"
     # via -r requirements/static/ci/common.in
 ncclient==0.6.4
     # via junos-eznc
@@ -721,7 +721,7 @@ pyjwt==2.4.0
     # via
     #   adal
     #   twilio
-pymysql==1.0.2 ; python_version > "3.5"
+pymysql==1.0.2
     # via -r requirements/static/ci/linux.in
 pynacl==1.5.0
     # via
@@ -769,7 +769,7 @@ pytest-tempdir==2019.10.12
     #   pytest-salt-factories
 pytest-timeout==1.4.2
     # via -r requirements/pytest.txt
-pytest==7.2.0 ; python_version > "3.6"
+pytest==7.2.0
     # via
     #   -r requirements/pytest.txt
     #   pytest-custom-exit-code
@@ -798,7 +798,7 @@ python-etcd==0.4.5
     # via -r requirements/static/ci/common.in
 python-gnupg==0.4.8
     # via -r requirements/static/pkg/linux.in
-python-telegram-bot==13.7 ; python_version > "3.5"
+python-telegram-bot==13.7
     # via -r requirements/static/ci/linux.in
 pytz==2022.1
     # via
diff --git a/requirements/static/ci/py3.7/windows.txt b/requirements/static/ci/py3.7/windows.txt
index 427ffbccb61..070b7829a16 100644
--- a/requirements/static/ci/py3.7/windows.txt
+++ b/requirements/static/ci/py3.7/windows.txt
@@ -25,7 +25,7 @@ backports.entry-points-selectable==1.1.0
     # via virtualenv
 bcrypt==4.0.1
     # via passlib
-boto3==1.21.46 ; python_version >= "3.6"
+boto3==1.21.46
     # via
     #   -r requirements/static/ci/common.in
     #   moto
@@ -101,7 +101,7 @@ docker-pycreds==0.4.0
     # via docker
 docker==2.7.0
     # via -r requirements/static/ci/common.in
-etcd3-py==0.1.6 ; python_version >= "3.6"
+etcd3-py==0.1.6
     # via -r requirements/static/ci/common.in
 exceptiongroup==1.0.4
     # via pytest
@@ -119,7 +119,7 @@ geomet==0.1.2
     # via cassandra-driver
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32 ; python_version >= "3.7"
+gitpython==3.1.32
     # via
     #   -r requirements/static/ci/common.in
     #   -r requirements/windows.txt
@@ -196,7 +196,7 @@ more-itertools==8.2.0
     #   cherrypy
     #   jaraco.classes
     #   jaraco.functools
-moto==3.0.1 ; python_version >= "3.6"
+moto==3.0.1
     # via -r requirements/static/ci/common.in
 msgpack==1.0.2
     # via
@@ -245,7 +245,7 @@ pycparser==2.21
     #   cffi
 pycryptodomex==3.10.1
     # via -r requirements/crypto.txt
-pygit2==1.9.1 ; python_version >= "3.7"
+pygit2==1.9.1
     # via -r requirements/static/ci/windows.in
 pymssql==2.2.1
     # via -r requirements/windows.txt
@@ -289,7 +289,7 @@ pytest-tempdir==2019.10.12
     #   pytest-salt-factories
 pytest-timeout==1.4.2
     # via -r requirements/pytest.txt
-pytest==7.2.0 ; python_version > "3.6"
+pytest==7.2.0
     # via
     #   -r requirements/pytest.txt
     #   pytest-custom-exit-code
diff --git a/requirements/static/ci/py3.8/cloud.txt b/requirements/static/ci/py3.8/cloud.txt
index 719a9e8017f..f745c38d137 100644
--- a/requirements/static/ci/py3.8/cloud.txt
+++ b/requirements/static/ci/py3.8/cloud.txt
@@ -335,7 +335,7 @@ bcrypt==3.2.0
     # via
     #   paramiko
     #   passlib
-boto3==1.21.46 ; python_version >= "3.6"
+boto3==1.21.46
     # via
     #   -r requirements/static/ci/common.in
     #   moto
@@ -420,7 +420,7 @@ docker==5.0.2
     # via
     #   -r requirements/static/ci/common.in
     #   pytest-salt-factories
-etcd3-py==0.1.6 ; python_version >= "3.6"
+etcd3-py==0.1.6
     # via -r requirements/static/ci/common.in
 exceptiongroup==1.0.4
     # via pytest
@@ -442,7 +442,7 @@ geomet==0.2.1.post1
     # via cassandra-driver
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32 ; python_version >= "3.7"
+gitpython==3.1.32
     # via -r requirements/static/ci/common.in
 google-auth==2.1.0
     # via kubernetes
@@ -526,7 +526,7 @@ more-itertools==8.8.0
     #   cherrypy
     #   jaraco.classes
     #   jaraco.functools
-moto==3.0.1 ; python_version >= "3.6"
+moto==3.0.1
     # via -r requirements/static/ci/common.in
 msgpack==1.0.2
     # via
@@ -628,7 +628,7 @@ multidict==6.0.2
     # via
     #   aiohttp
     #   yarl
-napalm==3.3.1 ; sys_platform != "win32" and python_version > "3.6" and python_version < "3.10"
+napalm==3.3.1 ; sys_platform != "win32" and python_version < "3.10"
     # via -r requirements/static/ci/common.in
 ncclient==0.6.12
     # via
@@ -750,7 +750,7 @@ pytest-tempdir==2019.10.12
     #   pytest-salt-factories
 pytest-timeout==2.0.2
     # via -r requirements/pytest.txt
-pytest==7.2.0 ; python_version > "3.6"
+pytest==7.2.0
     # via
     #   -r requirements/pytest.txt
     #   pytest-custom-exit-code
diff --git a/requirements/static/ci/py3.8/freebsd.txt b/requirements/static/ci/py3.8/freebsd.txt
index 72fed05bd52..5523d07759f 100644
--- a/requirements/static/ci/py3.8/freebsd.txt
+++ b/requirements/static/ci/py3.8/freebsd.txt
@@ -333,7 +333,7 @@ bcrypt==3.1.6
     # via
     #   paramiko
     #   passlib
-boto3==1.21.46 ; python_version >= "3.6"
+boto3==1.21.46
     # via
     #   -r requirements/static/ci/common.in
     #   moto
@@ -417,7 +417,7 @@ docker==5.0.3
     # via
     #   -r requirements/static/ci/common.in
     #   pytest-salt-factories
-etcd3-py==0.1.6 ; python_version >= "3.6"
+etcd3-py==0.1.6
     # via -r requirements/static/ci/common.in
 exceptiongroup==1.0.4
     # via pytest
@@ -439,7 +439,7 @@ geomet==0.2.1.post1
     # via cassandra-driver
 gitdb==4.0.5
     # via gitpython
-gitpython==3.1.32 ; python_version >= "3.7"
+gitpython==3.1.32
     # via -r requirements/static/ci/common.in
 google-auth==1.6.3
     # via kubernetes
@@ -525,7 +525,7 @@ more-itertools==5.0.0
     #   cherrypy
     #   jaraco.classes
     #   jaraco.functools
-moto==3.0.1 ; python_version >= "3.6"
+moto==3.0.1
     # via -r requirements/static/ci/common.in
 msgpack==1.0.2
     # via
@@ -627,7 +627,7 @@ multidict==6.0.2
     # via
     #   aiohttp
     #   yarl
-napalm==3.1.0 ; sys_platform != "win32" and python_version > "3.6" and python_version < "3.10"
+napalm==3.1.0 ; sys_platform != "win32" and python_version < "3.10"
     # via -r requirements/static/ci/common.in
 ncclient==0.6.4
     # via junos-eznc
@@ -688,7 +688,7 @@ pycryptodomex==3.9.8
     # via -r requirements/crypto.txt
 pyeapi==0.8.3
     # via napalm
-pygit2==1.8.0 ; python_version >= "3.7"
+pygit2==1.8.0
     # via -r requirements/static/ci/freebsd.in
 pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and platform_system != "openbsd"
     # via -r requirements/static/ci/common.in
@@ -740,7 +740,7 @@ pytest-tempdir==2019.10.12
     #   pytest-salt-factories
 pytest-timeout==1.4.2
     # via -r requirements/pytest.txt
-pytest==7.2.0 ; python_version > "3.6"
+pytest==7.2.0
     # via
     #   -r requirements/pytest.txt
     #   pytest-custom-exit-code
diff --git a/requirements/static/ci/py3.8/lint.txt b/requirements/static/ci/py3.8/lint.txt
index a4c9f88df2c..eb9ccf647d7 100644
--- a/requirements/static/ci/py3.8/lint.txt
+++ b/requirements/static/ci/py3.8/lint.txt
@@ -338,7 +338,7 @@ bcrypt==3.2.0
     # via
     #   paramiko
     #   passlib
-boto3==1.21.46 ; python_version >= "3.6"
+boto3==1.21.46
     # via
     #   -r requirements/static/ci/common.in
     #   moto
@@ -421,7 +421,7 @@ dnspython==2.1.0
     #   python-etcd
 docker==5.0.0
     # via -r requirements/static/ci/common.in
-etcd3-py==0.1.6 ; python_version >= "3.6"
+etcd3-py==0.1.6
     # via -r requirements/static/ci/common.in
 filelock==3.0.12
     # via virtualenv
@@ -439,7 +439,7 @@ geomet==0.2.1.post1
     # via cassandra-driver
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32 ; python_version >= "3.7"
+gitpython==3.1.32
     # via -r requirements/static/ci/common.in
 google-auth==2.0.1
     # via kubernetes
@@ -532,7 +532,7 @@ more-itertools==8.8.0
     #   cherrypy
     #   jaraco.classes
     #   jaraco.functools
-moto==3.0.1 ; python_version >= "3.6"
+moto==3.0.1
     # via -r requirements/static/ci/common.in
 msgpack==1.0.2
     # via -r requirements/base.txt
@@ -632,7 +632,7 @@ multidict==6.0.2
     # via
     #   aiohttp
     #   yarl
-napalm==3.3.1 ; sys_platform != "win32" and python_version > "3.6" and python_version < "3.10"
+napalm==3.3.1 ; sys_platform != "win32" and python_version < "3.10"
     # via -r requirements/static/ci/common.in
 ncclient==0.6.12
     # via
@@ -705,7 +705,7 @@ pylint==2.4.4
     # via
     #   -r requirements/static/ci/lint.in
     #   saltpylint
-pymysql==1.0.2 ; python_version > "3.5"
+pymysql==1.0.2
     # via -r requirements/static/ci/linux.in
 pynacl==1.5.0
     # via
@@ -742,7 +742,7 @@ python-etcd==0.4.5
     # via -r requirements/static/ci/common.in
 python-gnupg==0.4.8
     # via -r requirements/static/pkg/linux.in
-python-telegram-bot==13.7 ; python_version > "3.5"
+python-telegram-bot==13.7
     # via -r requirements/static/ci/linux.in
 pytz==2022.1
     # via
diff --git a/requirements/static/ci/py3.8/linux.txt b/requirements/static/ci/py3.8/linux.txt
index 813e472060b..73f4b260208 100644
--- a/requirements/static/ci/py3.8/linux.txt
+++ b/requirements/static/ci/py3.8/linux.txt
@@ -344,7 +344,7 @@ bcrypt==3.1.6
     # via
     #   paramiko
     #   passlib
-boto3==1.21.46 ; python_version >= "3.6"
+boto3==1.21.46
     # via
     #   -r requirements/static/ci/common.in
     #   moto
@@ -431,7 +431,7 @@ docker==5.0.3
     # via
     #   -r requirements/static/ci/common.in
     #   pytest-salt-factories
-etcd3-py==0.1.6 ; python_version >= "3.6"
+etcd3-py==0.1.6
     # via -r requirements/static/ci/common.in
 exceptiongroup==1.0.4
     # via pytest
@@ -453,7 +453,7 @@ geomet==0.1.2
     # via cassandra-driver
 gitdb==4.0.5
     # via gitpython
-gitpython==3.1.32 ; python_version >= "3.7"
+gitpython==3.1.32
     # via -r requirements/static/ci/common.in
 google-auth==1.6.3
     # via kubernetes
@@ -540,7 +540,7 @@ more-itertools==5.0.0
     #   cherrypy
     #   jaraco.classes
     #   jaraco.functools
-moto==3.0.1 ; python_version >= "3.6"
+moto==3.0.1
     # via -r requirements/static/ci/common.in
 msgpack==1.0.2
     # via
@@ -639,7 +639,7 @@ multidict==6.0.2
     # via
     #   aiohttp
     #   yarl
-napalm==3.1.0 ; sys_platform != "win32" and python_version > "3.6" and python_version < "3.10"
+napalm==3.1.0 ; sys_platform != "win32" and python_version < "3.10"
     # via -r requirements/static/ci/common.in
 ncclient==0.6.4
     # via junos-eznc
@@ -711,7 +711,7 @@ pyjwt==2.4.0
     # via
     #   adal
     #   twilio
-pymysql==1.0.2 ; python_version > "3.5"
+pymysql==1.0.2
     # via -r requirements/static/ci/linux.in
 pynacl==1.5.0
     # via
@@ -757,7 +757,7 @@ pytest-tempdir==2019.10.12
     #   pytest-salt-factories
 pytest-timeout==1.4.2
     # via -r requirements/pytest.txt
-pytest==7.2.0 ; python_version > "3.6"
+pytest==7.2.0
     # via
     #   -r requirements/pytest.txt
     #   pytest-custom-exit-code
@@ -786,7 +786,7 @@ python-etcd==0.4.5
     # via -r requirements/static/ci/common.in
 python-gnupg==0.4.8
     # via -r requirements/static/pkg/linux.in
-python-telegram-bot==13.7 ; python_version > "3.5"
+python-telegram-bot==13.7
     # via -r requirements/static/ci/linux.in
 pytz==2022.1
     # via
diff --git a/requirements/static/ci/py3.8/windows.txt b/requirements/static/ci/py3.8/windows.txt
index a569f4cc57e..42339f24695 100644
--- a/requirements/static/ci/py3.8/windows.txt
+++ b/requirements/static/ci/py3.8/windows.txt
@@ -23,7 +23,7 @@ backports.entry-points-selectable==1.1.0
     # via virtualenv
 bcrypt==4.0.1
     # via passlib
-boto3==1.21.46 ; python_version >= "3.6"
+boto3==1.21.46
     # via
     #   -r requirements/static/ci/common.in
     #   moto
@@ -97,7 +97,7 @@ docker-pycreds==0.4.0
     # via docker
 docker==2.7.0
     # via -r requirements/static/ci/common.in
-etcd3-py==0.1.6 ; python_version >= "3.6"
+etcd3-py==0.1.6
     # via -r requirements/static/ci/common.in
 exceptiongroup==1.0.4
     # via pytest
@@ -115,7 +115,7 @@ geomet==0.1.2
     # via cassandra-driver
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32 ; python_version >= "3.7"
+gitpython==3.1.32
     # via
     #   -r requirements/static/ci/common.in
     #   -r requirements/windows.txt
@@ -184,7 +184,7 @@ more-itertools==8.2.0
     #   cherrypy
     #   jaraco.classes
     #   jaraco.functools
-moto==3.0.1 ; python_version >= "3.6"
+moto==3.0.1
     # via -r requirements/static/ci/common.in
 msgpack==1.0.2
     # via
@@ -233,7 +233,7 @@ pycparser==2.21
     #   cffi
 pycryptodomex==3.10.1
     # via -r requirements/crypto.txt
-pygit2==1.9.1 ; python_version >= "3.7"
+pygit2==1.9.1
     # via -r requirements/static/ci/windows.in
 pymssql==2.2.1
     # via -r requirements/windows.txt
@@ -277,7 +277,7 @@ pytest-tempdir==2019.10.12
     #   pytest-salt-factories
 pytest-timeout==1.4.2
     # via -r requirements/pytest.txt
-pytest==7.2.0 ; python_version > "3.6"
+pytest==7.2.0
     # via
     #   -r requirements/pytest.txt
     #   pytest-custom-exit-code
diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt
index 96475f41697..db7f5d7a899 100644
--- a/requirements/static/ci/py3.9/cloud.txt
+++ b/requirements/static/ci/py3.9/cloud.txt
@@ -335,7 +335,7 @@ bcrypt==3.2.0
     # via
     #   paramiko
     #   passlib
-boto3==1.21.46 ; python_version >= "3.6"
+boto3==1.21.46
     # via
     #   -r requirements/static/ci/common.in
     #   moto
@@ -420,7 +420,7 @@ docker==5.0.2
     # via
     #   -r requirements/static/ci/common.in
     #   pytest-salt-factories
-etcd3-py==0.1.6 ; python_version >= "3.6"
+etcd3-py==0.1.6
     # via -r requirements/static/ci/common.in
 exceptiongroup==1.0.4
     # via pytest
@@ -442,7 +442,7 @@ geomet==0.2.1.post1
     # via cassandra-driver
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32 ; python_version >= "3.7"
+gitpython==3.1.32
     # via -r requirements/static/ci/common.in
 google-auth==2.1.0
     # via kubernetes
@@ -526,7 +526,7 @@ more-itertools==8.8.0
     #   cherrypy
     #   jaraco.classes
     #   jaraco.functools
-moto==3.0.1 ; python_version >= "3.6"
+moto==3.0.1
     # via -r requirements/static/ci/common.in
 msgpack==1.0.2
     # via
@@ -628,7 +628,7 @@ multidict==6.0.2
     # via
     #   aiohttp
     #   yarl
-napalm==3.3.1 ; sys_platform != "win32" and python_version > "3.6" and python_version < "3.10"
+napalm==3.3.1 ; sys_platform != "win32" and python_version < "3.10"
     # via -r requirements/static/ci/common.in
 ncclient==0.6.12
     # via
@@ -753,7 +753,7 @@ pytest-tempdir==2019.10.12
     #   pytest-salt-factories
 pytest-timeout==2.0.2
     # via -r requirements/pytest.txt
-pytest==7.2.0 ; python_version > "3.6"
+pytest==7.2.0
     # via
     #   -r requirements/pytest.txt
     #   pytest-custom-exit-code
diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt
index b7919e3ad5d..e948d5f2bf1 100644
--- a/requirements/static/ci/py3.9/darwin.txt
+++ b/requirements/static/ci/py3.9/darwin.txt
@@ -335,7 +335,7 @@ bcrypt==3.1.6
     # via
     #   paramiko
     #   passlib
-boto3==1.21.46 ; python_version >= "3.6"
+boto3==1.21.46
     # via
     #   -r requirements/static/ci/common.in
     #   moto
@@ -418,7 +418,7 @@ docker==5.0.3
     # via
     #   -r requirements/static/ci/common.in
     #   pytest-salt-factories
-etcd3-py==0.1.6 ; python_version >= "3.6"
+etcd3-py==0.1.6
     # via -r requirements/static/ci/common.in
 exceptiongroup==1.0.4
     # via pytest
@@ -440,7 +440,7 @@ geomet==0.1.2
     # via cassandra-driver
 gitdb==4.0.5
     # via gitpython
-gitpython==3.1.32 ; python_version >= "3.7"
+gitpython==3.1.32
     # via
     #   -r requirements/darwin.txt
     #   -r requirements/static/ci/common.in
@@ -527,7 +527,7 @@ more-itertools==8.2.0
     #   cherrypy
     #   jaraco.classes
     #   jaraco.functools
-moto==3.0.1 ; python_version >= "3.6"
+moto==3.0.1
     # via -r requirements/static/ci/common.in
 msgpack==1.0.2
     # via
@@ -629,7 +629,7 @@ multidict==6.0.2
     # via
     #   aiohttp
     #   yarl
-napalm==3.1.0 ; sys_platform != "win32" and python_version > "3.6" and python_version < "3.10"
+napalm==3.1.0 ; sys_platform != "win32" and python_version < "3.10"
     # via -r requirements/static/ci/common.in
 ncclient==0.6.4
     # via junos-eznc
@@ -693,7 +693,7 @@ pycryptodomex==3.9.8
     # via -r requirements/crypto.txt
 pyeapi==0.8.3
     # via napalm
-pygit2==1.9.1 ; python_version >= "3.7"
+pygit2==1.9.1
     # via -r requirements/static/ci/darwin.in
 pyjwt==2.4.0
     # via adal
@@ -743,7 +743,7 @@ pytest-tempdir==2019.10.12
     #   pytest-salt-factories
 pytest-timeout==1.4.2
     # via -r requirements/pytest.txt
-pytest==7.2.0 ; python_version > "3.6"
+pytest==7.2.0
     # via
     #   -r requirements/pytest.txt
     #   pytest-custom-exit-code
diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt
index fa800ba551a..f46090934fd 100644
--- a/requirements/static/ci/py3.9/freebsd.txt
+++ b/requirements/static/ci/py3.9/freebsd.txt
@@ -333,7 +333,7 @@ bcrypt==3.1.6
     # via
     #   paramiko
     #   passlib
-boto3==1.21.46 ; python_version >= "3.6"
+boto3==1.21.46
     # via
     #   -r requirements/static/ci/common.in
     #   moto
@@ -417,7 +417,7 @@ docker==5.0.3
     # via
     #   -r requirements/static/ci/common.in
     #   pytest-salt-factories
-etcd3-py==0.1.6 ; python_version >= "3.6"
+etcd3-py==0.1.6
     # via -r requirements/static/ci/common.in
 exceptiongroup==1.0.4
     # via pytest
@@ -439,7 +439,7 @@ geomet==0.2.1.post1
     # via cassandra-driver
 gitdb==4.0.5
     # via gitpython
-gitpython==3.1.32 ; python_version >= "3.7"
+gitpython==3.1.32
     # via -r requirements/static/ci/common.in
 google-auth==1.6.3
     # via kubernetes
@@ -525,7 +525,7 @@ more-itertools==5.0.0
     #   cherrypy
     #   jaraco.classes
     #   jaraco.functools
-moto==3.0.1 ; python_version >= "3.6"
+moto==3.0.1
     # via -r requirements/static/ci/common.in
 msgpack==1.0.2
     # via
@@ -627,7 +627,7 @@ multidict==6.0.2
     # via
     #   aiohttp
     #   yarl
-napalm==3.1.0 ; sys_platform != "win32" and python_version > "3.6" and python_version < "3.10"
+napalm==3.1.0 ; sys_platform != "win32" and python_version < "3.10"
     # via -r requirements/static/ci/common.in
 ncclient==0.6.4
     # via junos-eznc
@@ -691,7 +691,7 @@ pycryptodomex==3.9.8
     # via -r requirements/crypto.txt
 pyeapi==0.8.3
     # via napalm
-pygit2==1.8.0 ; python_version >= "3.7"
+pygit2==1.8.0
     # via -r requirements/static/ci/freebsd.in
 pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and platform_system != "openbsd"
     # via -r requirements/static/ci/common.in
@@ -743,7 +743,7 @@ pytest-tempdir==2019.10.12
     #   pytest-salt-factories
 pytest-timeout==1.4.2
     # via -r requirements/pytest.txt
-pytest==7.2.0 ; python_version > "3.6"
+pytest==7.2.0
     # via
     #   -r requirements/pytest.txt
     #   pytest-custom-exit-code
diff --git a/requirements/static/ci/py3.9/lint.txt b/requirements/static/ci/py3.9/lint.txt
index 28cce1cc652..c34a07a08d6 100644
--- a/requirements/static/ci/py3.9/lint.txt
+++ b/requirements/static/ci/py3.9/lint.txt
@@ -336,7 +336,7 @@ bcrypt==3.2.0
     # via
     #   paramiko
     #   passlib
-boto3==1.21.46 ; python_version >= "3.6"
+boto3==1.21.46
     # via
     #   -r requirements/static/ci/common.in
     #   moto
@@ -419,7 +419,7 @@ dnspython==2.1.0
     #   python-etcd
 docker==5.0.0
     # via -r requirements/static/ci/common.in
-etcd3-py==0.1.6 ; python_version >= "3.6"
+etcd3-py==0.1.6
     # via -r requirements/static/ci/common.in
 filelock==3.0.12
     # via virtualenv
@@ -437,7 +437,7 @@ geomet==0.2.1.post1
     # via cassandra-driver
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32 ; python_version >= "3.7"
+gitpython==3.1.32
     # via -r requirements/static/ci/common.in
 google-auth==2.0.1
     # via kubernetes
@@ -530,7 +530,7 @@ more-itertools==8.8.0
     #   cherrypy
     #   jaraco.classes
     #   jaraco.functools
-moto==3.0.1 ; python_version >= "3.6"
+moto==3.0.1
     # via -r requirements/static/ci/common.in
 msgpack==1.0.2
     # via -r requirements/base.txt
@@ -630,7 +630,7 @@ multidict==6.0.2
     # via
     #   aiohttp
     #   yarl
-napalm==3.3.1 ; sys_platform != "win32" and python_version > "3.6" and python_version < "3.10"
+napalm==3.3.1 ; sys_platform != "win32" and python_version < "3.10"
     # via -r requirements/static/ci/common.in
 ncclient==0.6.12
     # via
@@ -706,7 +706,7 @@ pylint==2.4.4
     # via
     #   -r requirements/static/ci/lint.in
     #   saltpylint
-pymysql==1.0.2 ; python_version > "3.5"
+pymysql==1.0.2
     # via -r requirements/static/ci/linux.in
 pynacl==1.5.0
     # via
@@ -743,7 +743,7 @@ python-etcd==0.4.5
     # via -r requirements/static/ci/common.in
 python-gnupg==0.4.8
     # via -r requirements/static/pkg/linux.in
-python-telegram-bot==13.7 ; python_version > "3.5"
+python-telegram-bot==13.7
     # via -r requirements/static/ci/linux.in
 pytz==2022.1
     # via
diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt
index 2b12495b674..60849297f15 100644
--- a/requirements/static/ci/py3.9/linux.txt
+++ b/requirements/static/ci/py3.9/linux.txt
@@ -344,7 +344,7 @@ bcrypt==3.1.6
     # via
     #   paramiko
     #   passlib
-boto3==1.21.46 ; python_version >= "3.6"
+boto3==1.21.46
     # via
     #   -r requirements/static/ci/common.in
     #   moto
@@ -433,7 +433,7 @@ docker==5.0.3
     # via
     #   -r requirements/static/ci/common.in
     #   pytest-salt-factories
-etcd3-py==0.1.6 ; python_version >= "3.6"
+etcd3-py==0.1.6
     # via -r requirements/static/ci/common.in
 exceptiongroup==1.0.4
     # via pytest
@@ -455,7 +455,7 @@ geomet==0.1.2
     # via cassandra-driver
 gitdb==4.0.5
     # via gitpython
-gitpython==3.1.32 ; python_version >= "3.7"
+gitpython==3.1.32
     # via -r requirements/static/ci/common.in
 google-auth==1.6.3
     # via kubernetes
@@ -542,7 +542,7 @@ more-itertools==5.0.0
     #   cherrypy
     #   jaraco.classes
     #   jaraco.functools
-moto==3.0.1 ; python_version >= "3.6"
+moto==3.0.1
     # via -r requirements/static/ci/common.in
 msgpack==1.0.2
     # via
@@ -641,7 +641,7 @@ multidict==6.0.2
     # via
     #   aiohttp
     #   yarl
-napalm==3.1.0 ; sys_platform != "win32" and python_version > "3.6" and python_version < "3.10"
+napalm==3.1.0 ; sys_platform != "win32" and python_version < "3.10"
     # via -r requirements/static/ci/common.in
 ncclient==0.6.4
     # via junos-eznc
@@ -716,7 +716,7 @@ pyjwt==2.4.0
     # via
     #   adal
     #   twilio
-pymysql==1.0.2 ; python_version > "3.5"
+pymysql==1.0.2
     # via -r requirements/static/ci/linux.in
 pynacl==1.5.0
     # via
@@ -762,7 +762,7 @@ pytest-tempdir==2019.10.12
     #   pytest-salt-factories
 pytest-timeout==1.4.2
     # via -r requirements/pytest.txt
-pytest==7.2.0 ; python_version > "3.6"
+pytest==7.2.0
     # via
     #   -r requirements/pytest.txt
     #   pytest-custom-exit-code
@@ -791,7 +791,7 @@ python-etcd==0.4.5
     # via -r requirements/static/ci/common.in
 python-gnupg==0.4.8
     # via -r requirements/static/pkg/linux.in
-python-telegram-bot==13.7 ; python_version > "3.5"
+python-telegram-bot==13.7
     # via -r requirements/static/ci/linux.in
 pytz==2022.1
     # via
diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt
index ca747c4bd01..8a52aac3ade 100644
--- a/requirements/static/ci/py3.9/windows.txt
+++ b/requirements/static/ci/py3.9/windows.txt
@@ -23,7 +23,7 @@ backports.entry-points-selectable==1.1.0
     # via virtualenv
 bcrypt==4.0.1
     # via passlib
-boto3==1.21.46 ; python_version >= "3.6"
+boto3==1.21.46
     # via
     #   -r requirements/static/ci/common.in
     #   moto
@@ -97,7 +97,7 @@ docker-pycreds==0.4.0
     # via docker
 docker==2.7.0
     # via -r requirements/static/ci/common.in
-etcd3-py==0.1.6 ; python_version >= "3.6"
+etcd3-py==0.1.6
     # via -r requirements/static/ci/common.in
 exceptiongroup==1.0.4
     # via pytest
@@ -115,7 +115,7 @@ geomet==0.1.2
     # via cassandra-driver
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32 ; python_version >= "3.7"
+gitpython==3.1.32
     # via
     #   -r requirements/static/ci/common.in
     #   -r requirements/windows.txt
@@ -184,7 +184,7 @@ more-itertools==8.2.0
     #   cherrypy
     #   jaraco.classes
     #   jaraco.functools
-moto==3.0.1 ; python_version >= "3.6"
+moto==3.0.1
     # via -r requirements/static/ci/common.in
 msgpack==1.0.2
     # via
@@ -234,7 +234,7 @@ pycparser==2.21 ; python_version >= "3.9"
     #   cffi
 pycryptodomex==3.10.1
     # via -r requirements/crypto.txt
-pygit2==1.9.1 ; python_version >= "3.7"
+pygit2==1.9.1
     # via -r requirements/static/ci/windows.in
 pymssql==2.2.1
     # via -r requirements/windows.txt
@@ -278,7 +278,7 @@ pytest-tempdir==2019.10.12
     #   pytest-salt-factories
 pytest-timeout==1.4.2
     # via -r requirements/pytest.txt
-pytest==7.2.0 ; python_version > "3.6"
+pytest==7.2.0
     # via
     #   -r requirements/pytest.txt
     #   pytest-custom-exit-code
diff --git a/requirements/static/ci/windows.in b/requirements/static/ci/windows.in
index b2b7857de46..38fc3fd2e08 100644
--- a/requirements/static/ci/windows.in
+++ b/requirements/static/ci/windows.in
@@ -1,7 +1,7 @@
 # This is a compilation of requirements installed on salt-jenkins git.salt state run
 dmidecode
 patch
-pygit2>=1.2.0; python_version >= '3.7'
+pygit2>=1.2.0
 sed
 pywinrm>=0.4.1
 yamllint
diff --git a/requirements/static/pkg/freebsd.in b/requirements/static/pkg/freebsd.in
index 1e176a3bed5..3780d5b0fd8 100644
--- a/requirements/static/pkg/freebsd.in
+++ b/requirements/static/pkg/freebsd.in
@@ -2,7 +2,6 @@
 # Any non hard dependencies of Salt for FreeBSD can go here
 cherrypy
 cryptography>=41.0.3
-backports.ssl_match_hostname>=3.7.0.1; python_version < '3.7'
 pycparser>=2.21; python_version >= '3.9'
 pyopenssl>=23.2.0
 python-dateutil>=2.8.0
diff --git a/requirements/static/pkg/linux.in b/requirements/static/pkg/linux.in
index a47fa824571..937c6d3b204 100644
--- a/requirements/static/pkg/linux.in
+++ b/requirements/static/pkg/linux.in
@@ -1,7 +1,6 @@
 # This file only exists to trigger the right static compiled requirements destination.
 # Any non hard dependencies of Salt for linux can go here
 cherrypy
-backports.ssl_match_hostname>=3.7.0.1; python_version < '3.7'
 pycparser>=2.21; python_version >= '3.9'
 pyopenssl>=23.2.0
 python-dateutil>=2.8.0
diff --git a/requirements/static/pkg/py3.10/darwin.txt b/requirements/static/pkg/py3.10/darwin.txt
index 29ffba3c654..47c12f9101c 100644
--- a/requirements/static/pkg/py3.10/darwin.txt
+++ b/requirements/static/pkg/py3.10/darwin.txt
@@ -26,7 +26,7 @@ distro==1.5.0
     # via -r requirements/base.txt
 gitdb==4.0.5
     # via gitpython
-gitpython==3.1.32 ; python_version >= "3.7"
+gitpython==3.1.32
     # via -r requirements/darwin.txt
 idna==2.8
     # via
diff --git a/requirements/static/pkg/py3.10/windows.txt b/requirements/static/pkg/py3.10/windows.txt
index cb8689efc64..38d35777b84 100644
--- a/requirements/static/pkg/py3.10/windows.txt
+++ b/requirements/static/pkg/py3.10/windows.txt
@@ -31,7 +31,7 @@ distro==1.5.0
     # via -r requirements/base.txt
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32 ; python_version >= "3.7"
+gitpython==3.1.32
     # via -r requirements/windows.txt
 idna==2.8
     # via requests
diff --git a/requirements/static/pkg/py3.7/windows.txt b/requirements/static/pkg/py3.7/windows.txt
index ebe7e57c8aa..d5cb5495afa 100644
--- a/requirements/static/pkg/py3.7/windows.txt
+++ b/requirements/static/pkg/py3.7/windows.txt
@@ -31,7 +31,7 @@ distro==1.5.0
     # via -r requirements/base.txt
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32 ; python_version >= "3.7"
+gitpython==3.1.32
     # via -r requirements/windows.txt
 idna==2.8
     # via requests
diff --git a/requirements/static/pkg/py3.8/windows.txt b/requirements/static/pkg/py3.8/windows.txt
index 22bfc68ae51..7fcd3c74327 100644
--- a/requirements/static/pkg/py3.8/windows.txt
+++ b/requirements/static/pkg/py3.8/windows.txt
@@ -31,7 +31,7 @@ distro==1.5.0
     # via -r requirements/base.txt
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32 ; python_version >= "3.7"
+gitpython==3.1.32
     # via -r requirements/windows.txt
 idna==2.8
     # via requests
diff --git a/requirements/static/pkg/py3.9/darwin.txt b/requirements/static/pkg/py3.9/darwin.txt
index e81cc47fdc3..061a754124c 100644
--- a/requirements/static/pkg/py3.9/darwin.txt
+++ b/requirements/static/pkg/py3.9/darwin.txt
@@ -26,7 +26,7 @@ distro==1.5.0
     # via -r requirements/base.txt
 gitdb==4.0.5
     # via gitpython
-gitpython==3.1.32 ; python_version >= "3.7"
+gitpython==3.1.32
     # via -r requirements/darwin.txt
 idna==2.8
     # via
diff --git a/requirements/static/pkg/py3.9/windows.txt b/requirements/static/pkg/py3.9/windows.txt
index 60a28ce2e2a..5a026fdbc81 100644
--- a/requirements/static/pkg/py3.9/windows.txt
+++ b/requirements/static/pkg/py3.9/windows.txt
@@ -31,7 +31,7 @@ distro==1.5.0
     # via -r requirements/base.txt
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32 ; python_version >= "3.7"
+gitpython==3.1.32
     # via -r requirements/windows.txt
 idna==2.8
     # via requests
diff --git a/requirements/windows.txt b/requirements/windows.txt
index 998bdd2dadc..7911eef6732 100644
--- a/requirements/windows.txt
+++ b/requirements/windows.txt
@@ -6,12 +6,11 @@ pywin32>=305
 wmi>=1.5.1
 pythonnet>=3.0.1
 
-backports.ssl-match-hostname>=3.7.0.1; python_version < '3.7'
 certifi>=2022.12.07
 cffi>=1.14.5
 cherrypy>=18.6.1
 cryptography>=41.0.3
-gitpython>=3.1.30; python_version >= '3.7'
+gitpython>=3.1.30
 ioloop>=0.1a0
 lxml>=4.6.3
 pyasn1>=0.4.8

From fd0a725d7ec6be688bae5c49496a3d14d93fc635 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <palgarvio@vmware.com>
Date: Mon, 11 Sep 2023 09:44:11 +0100
Subject: [PATCH 56/65] Bump to `gitpython==3.1.35`

Due to https://github.com/advisories/GHSA-cwvm-v4w8-q58c
Due to https://github.com/advisories/GHSA-wfm5-v35h-vwf4

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
---
 requirements/static/ci/py3.10/cloud.txt    | 2 +-
 requirements/static/ci/py3.10/darwin.txt   | 2 +-
 requirements/static/ci/py3.10/freebsd.txt  | 2 +-
 requirements/static/ci/py3.10/lint.txt     | 2 +-
 requirements/static/ci/py3.10/linux.txt    | 2 +-
 requirements/static/ci/py3.10/windows.txt  | 2 +-
 requirements/static/ci/py3.7/cloud.txt     | 2 +-
 requirements/static/ci/py3.7/freebsd.txt   | 2 +-
 requirements/static/ci/py3.7/lint.txt      | 2 +-
 requirements/static/ci/py3.7/linux.txt     | 2 +-
 requirements/static/ci/py3.7/windows.txt   | 2 +-
 requirements/static/ci/py3.8/cloud.txt     | 2 +-
 requirements/static/ci/py3.8/freebsd.txt   | 2 +-
 requirements/static/ci/py3.8/lint.txt      | 2 +-
 requirements/static/ci/py3.8/linux.txt     | 2 +-
 requirements/static/ci/py3.8/windows.txt   | 2 +-
 requirements/static/ci/py3.9/cloud.txt     | 2 +-
 requirements/static/ci/py3.9/darwin.txt    | 2 +-
 requirements/static/ci/py3.9/freebsd.txt   | 2 +-
 requirements/static/ci/py3.9/lint.txt      | 2 +-
 requirements/static/ci/py3.9/linux.txt     | 2 +-
 requirements/static/ci/py3.9/windows.txt   | 2 +-
 requirements/static/pkg/py3.10/darwin.txt  | 2 +-
 requirements/static/pkg/py3.10/windows.txt | 2 +-
 requirements/static/pkg/py3.7/windows.txt  | 2 +-
 requirements/static/pkg/py3.8/windows.txt  | 2 +-
 requirements/static/pkg/py3.9/darwin.txt   | 2 +-
 requirements/static/pkg/py3.9/windows.txt  | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt
index 0fd1d6fb3db..f02a891c864 100644
--- a/requirements/static/ci/py3.10/cloud.txt
+++ b/requirements/static/ci/py3.10/cloud.txt
@@ -432,7 +432,7 @@ geomet==0.2.1.post1
     # via cassandra-driver
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via -r requirements/static/ci/common.in
 google-auth==2.1.0
     # via kubernetes
diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt
index 8e43b9a0371..5e2c45d353d 100644
--- a/requirements/static/ci/py3.10/darwin.txt
+++ b/requirements/static/ci/py3.10/darwin.txt
@@ -430,7 +430,7 @@ geomet==0.1.2
     # via cassandra-driver
 gitdb==4.0.5
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via
     #   -r requirements/darwin.txt
     #   -r requirements/static/ci/common.in
diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt
index b17de0c8156..67181e0a5d5 100644
--- a/requirements/static/ci/py3.10/freebsd.txt
+++ b/requirements/static/ci/py3.10/freebsd.txt
@@ -429,7 +429,7 @@ geomet==0.2.1.post1
     # via cassandra-driver
 gitdb==4.0.5
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via -r requirements/static/ci/common.in
 google-auth==1.6.3
     # via kubernetes
diff --git a/requirements/static/ci/py3.10/lint.txt b/requirements/static/ci/py3.10/lint.txt
index f5a55633c4a..d48d774d627 100644
--- a/requirements/static/ci/py3.10/lint.txt
+++ b/requirements/static/ci/py3.10/lint.txt
@@ -427,7 +427,7 @@ geomet==0.2.1.post1
     # via cassandra-driver
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via -r requirements/static/ci/common.in
 google-auth==2.0.1
     # via kubernetes
diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt
index ba85e91fdc9..3cbd0eb1189 100644
--- a/requirements/static/ci/py3.10/linux.txt
+++ b/requirements/static/ci/py3.10/linux.txt
@@ -443,7 +443,7 @@ geomet==0.1.2
     # via cassandra-driver
 gitdb==4.0.5
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via -r requirements/static/ci/common.in
 google-auth==1.6.3
     # via kubernetes
diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt
index 66bd0d7590c..882fe375b4a 100644
--- a/requirements/static/ci/py3.10/windows.txt
+++ b/requirements/static/ci/py3.10/windows.txt
@@ -113,7 +113,7 @@ geomet==0.1.2
     # via cassandra-driver
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via
     #   -r requirements/static/ci/common.in
     #   -r requirements/windows.txt
diff --git a/requirements/static/ci/py3.7/cloud.txt b/requirements/static/ci/py3.7/cloud.txt
index 84a48dd4102..be9ccab2f97 100644
--- a/requirements/static/ci/py3.7/cloud.txt
+++ b/requirements/static/ci/py3.7/cloud.txt
@@ -444,7 +444,7 @@ geomet==0.2.1.post1
     # via cassandra-driver
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via -r requirements/static/ci/common.in
 google-auth==2.1.0
     # via kubernetes
diff --git a/requirements/static/ci/py3.7/freebsd.txt b/requirements/static/ci/py3.7/freebsd.txt
index 6378d6f687b..7d472b48871 100644
--- a/requirements/static/ci/py3.7/freebsd.txt
+++ b/requirements/static/ci/py3.7/freebsd.txt
@@ -441,7 +441,7 @@ geomet==0.2.1.post1
     # via cassandra-driver
 gitdb==4.0.5
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via -r requirements/static/ci/common.in
 google-auth==1.6.3
     # via kubernetes
diff --git a/requirements/static/ci/py3.7/lint.txt b/requirements/static/ci/py3.7/lint.txt
index 0bfa44f611b..0849d8cc45e 100644
--- a/requirements/static/ci/py3.7/lint.txt
+++ b/requirements/static/ci/py3.7/lint.txt
@@ -441,7 +441,7 @@ geomet==0.2.1.post1
     # via cassandra-driver
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via -r requirements/static/ci/common.in
 google-auth==2.0.1
     # via kubernetes
diff --git a/requirements/static/ci/py3.7/linux.txt b/requirements/static/ci/py3.7/linux.txt
index 52202b23cd1..22c85e99278 100644
--- a/requirements/static/ci/py3.7/linux.txt
+++ b/requirements/static/ci/py3.7/linux.txt
@@ -455,7 +455,7 @@ geomet==0.1.2
     # via cassandra-driver
 gitdb==4.0.5
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via -r requirements/static/ci/common.in
 google-auth==1.6.3
     # via kubernetes
diff --git a/requirements/static/ci/py3.7/windows.txt b/requirements/static/ci/py3.7/windows.txt
index 070b7829a16..222a100ac41 100644
--- a/requirements/static/ci/py3.7/windows.txt
+++ b/requirements/static/ci/py3.7/windows.txt
@@ -119,7 +119,7 @@ geomet==0.1.2
     # via cassandra-driver
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via
     #   -r requirements/static/ci/common.in
     #   -r requirements/windows.txt
diff --git a/requirements/static/ci/py3.8/cloud.txt b/requirements/static/ci/py3.8/cloud.txt
index f745c38d137..107b9772f37 100644
--- a/requirements/static/ci/py3.8/cloud.txt
+++ b/requirements/static/ci/py3.8/cloud.txt
@@ -442,7 +442,7 @@ geomet==0.2.1.post1
     # via cassandra-driver
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via -r requirements/static/ci/common.in
 google-auth==2.1.0
     # via kubernetes
diff --git a/requirements/static/ci/py3.8/freebsd.txt b/requirements/static/ci/py3.8/freebsd.txt
index 5523d07759f..dc801416efd 100644
--- a/requirements/static/ci/py3.8/freebsd.txt
+++ b/requirements/static/ci/py3.8/freebsd.txt
@@ -439,7 +439,7 @@ geomet==0.2.1.post1
     # via cassandra-driver
 gitdb==4.0.5
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via -r requirements/static/ci/common.in
 google-auth==1.6.3
     # via kubernetes
diff --git a/requirements/static/ci/py3.8/lint.txt b/requirements/static/ci/py3.8/lint.txt
index eb9ccf647d7..6755a692c8c 100644
--- a/requirements/static/ci/py3.8/lint.txt
+++ b/requirements/static/ci/py3.8/lint.txt
@@ -439,7 +439,7 @@ geomet==0.2.1.post1
     # via cassandra-driver
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via -r requirements/static/ci/common.in
 google-auth==2.0.1
     # via kubernetes
diff --git a/requirements/static/ci/py3.8/linux.txt b/requirements/static/ci/py3.8/linux.txt
index 73f4b260208..47e7bf292dc 100644
--- a/requirements/static/ci/py3.8/linux.txt
+++ b/requirements/static/ci/py3.8/linux.txt
@@ -453,7 +453,7 @@ geomet==0.1.2
     # via cassandra-driver
 gitdb==4.0.5
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via -r requirements/static/ci/common.in
 google-auth==1.6.3
     # via kubernetes
diff --git a/requirements/static/ci/py3.8/windows.txt b/requirements/static/ci/py3.8/windows.txt
index 42339f24695..cddbb9f51c3 100644
--- a/requirements/static/ci/py3.8/windows.txt
+++ b/requirements/static/ci/py3.8/windows.txt
@@ -115,7 +115,7 @@ geomet==0.1.2
     # via cassandra-driver
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via
     #   -r requirements/static/ci/common.in
     #   -r requirements/windows.txt
diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt
index db7f5d7a899..75a1dbfd588 100644
--- a/requirements/static/ci/py3.9/cloud.txt
+++ b/requirements/static/ci/py3.9/cloud.txt
@@ -442,7 +442,7 @@ geomet==0.2.1.post1
     # via cassandra-driver
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via -r requirements/static/ci/common.in
 google-auth==2.1.0
     # via kubernetes
diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt
index e948d5f2bf1..a8e2451ef14 100644
--- a/requirements/static/ci/py3.9/darwin.txt
+++ b/requirements/static/ci/py3.9/darwin.txt
@@ -440,7 +440,7 @@ geomet==0.1.2
     # via cassandra-driver
 gitdb==4.0.5
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via
     #   -r requirements/darwin.txt
     #   -r requirements/static/ci/common.in
diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt
index f46090934fd..2de184befd2 100644
--- a/requirements/static/ci/py3.9/freebsd.txt
+++ b/requirements/static/ci/py3.9/freebsd.txt
@@ -439,7 +439,7 @@ geomet==0.2.1.post1
     # via cassandra-driver
 gitdb==4.0.5
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via -r requirements/static/ci/common.in
 google-auth==1.6.3
     # via kubernetes
diff --git a/requirements/static/ci/py3.9/lint.txt b/requirements/static/ci/py3.9/lint.txt
index c34a07a08d6..a28a49abfaf 100644
--- a/requirements/static/ci/py3.9/lint.txt
+++ b/requirements/static/ci/py3.9/lint.txt
@@ -437,7 +437,7 @@ geomet==0.2.1.post1
     # via cassandra-driver
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via -r requirements/static/ci/common.in
 google-auth==2.0.1
     # via kubernetes
diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt
index 60849297f15..12d0d16e42c 100644
--- a/requirements/static/ci/py3.9/linux.txt
+++ b/requirements/static/ci/py3.9/linux.txt
@@ -455,7 +455,7 @@ geomet==0.1.2
     # via cassandra-driver
 gitdb==4.0.5
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via -r requirements/static/ci/common.in
 google-auth==1.6.3
     # via kubernetes
diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt
index 8a52aac3ade..1b4d0a33dc3 100644
--- a/requirements/static/ci/py3.9/windows.txt
+++ b/requirements/static/ci/py3.9/windows.txt
@@ -115,7 +115,7 @@ geomet==0.1.2
     # via cassandra-driver
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via
     #   -r requirements/static/ci/common.in
     #   -r requirements/windows.txt
diff --git a/requirements/static/pkg/py3.10/darwin.txt b/requirements/static/pkg/py3.10/darwin.txt
index 47c12f9101c..fa2e31f8961 100644
--- a/requirements/static/pkg/py3.10/darwin.txt
+++ b/requirements/static/pkg/py3.10/darwin.txt
@@ -26,7 +26,7 @@ distro==1.5.0
     # via -r requirements/base.txt
 gitdb==4.0.5
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via -r requirements/darwin.txt
 idna==2.8
     # via
diff --git a/requirements/static/pkg/py3.10/windows.txt b/requirements/static/pkg/py3.10/windows.txt
index 38d35777b84..a79f3ee3b37 100644
--- a/requirements/static/pkg/py3.10/windows.txt
+++ b/requirements/static/pkg/py3.10/windows.txt
@@ -31,7 +31,7 @@ distro==1.5.0
     # via -r requirements/base.txt
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via -r requirements/windows.txt
 idna==2.8
     # via requests
diff --git a/requirements/static/pkg/py3.7/windows.txt b/requirements/static/pkg/py3.7/windows.txt
index d5cb5495afa..80820ffafd4 100644
--- a/requirements/static/pkg/py3.7/windows.txt
+++ b/requirements/static/pkg/py3.7/windows.txt
@@ -31,7 +31,7 @@ distro==1.5.0
     # via -r requirements/base.txt
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via -r requirements/windows.txt
 idna==2.8
     # via requests
diff --git a/requirements/static/pkg/py3.8/windows.txt b/requirements/static/pkg/py3.8/windows.txt
index 7fcd3c74327..31a962b4614 100644
--- a/requirements/static/pkg/py3.8/windows.txt
+++ b/requirements/static/pkg/py3.8/windows.txt
@@ -31,7 +31,7 @@ distro==1.5.0
     # via -r requirements/base.txt
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via -r requirements/windows.txt
 idna==2.8
     # via requests
diff --git a/requirements/static/pkg/py3.9/darwin.txt b/requirements/static/pkg/py3.9/darwin.txt
index 061a754124c..cc8766fa845 100644
--- a/requirements/static/pkg/py3.9/darwin.txt
+++ b/requirements/static/pkg/py3.9/darwin.txt
@@ -26,7 +26,7 @@ distro==1.5.0
     # via -r requirements/base.txt
 gitdb==4.0.5
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via -r requirements/darwin.txt
 idna==2.8
     # via
diff --git a/requirements/static/pkg/py3.9/windows.txt b/requirements/static/pkg/py3.9/windows.txt
index 5a026fdbc81..85aae5f9ef4 100644
--- a/requirements/static/pkg/py3.9/windows.txt
+++ b/requirements/static/pkg/py3.9/windows.txt
@@ -31,7 +31,7 @@ distro==1.5.0
     # via -r requirements/base.txt
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.32
+gitpython==3.1.35
     # via -r requirements/windows.txt
 idna==2.8
     # via requests

From da9e410c8103e43422d50fe26531281d7a0b142e Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Mon, 11 Sep 2023 17:43:46 -0400
Subject: [PATCH 57/65] Fix pkg.latest for winrepo packages where the package
 is already up to date

---
 salt/states/pkg.py                    |  3 ++-
 tests/pytests/unit/states/test_pkg.py | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/salt/states/pkg.py b/salt/states/pkg.py
index aea68f94f52..08ddd83b82e 100644
--- a/salt/states/pkg.py
+++ b/salt/states/pkg.py
@@ -2789,7 +2789,8 @@ def latest(
                 x
                 for x in targets
                 if not changes.get(x)
-                or targets[x] not in changes[x].get("new").split(",")
+                or changes[x].get("new") is not None
+                and targets[x] not in changes[x].get("new").split(",")
                 and targets[x] != "latest"
             ]
             successful = [x for x in targets if x not in failed]
diff --git a/tests/pytests/unit/states/test_pkg.py b/tests/pytests/unit/states/test_pkg.py
index 2071f33ea79..00acceaa414 100644
--- a/tests/pytests/unit/states/test_pkg.py
+++ b/tests/pytests/unit/states/test_pkg.py
@@ -1196,3 +1196,24 @@ def test_latest_multiple_versions():
     with patch.dict(pkg.__salt__, salt_dict):
         ret = pkg.latest(pkg_name)
         assert ret.get("result", False) is True
+
+
+def test_latest_no_change_windows():
+    """
+    Test pkg.latest with no change to the package version for winrepo packages
+
+    See: https://github.com/saltstack/salt/issues/65165
+    """
+    pkg_name = "fake_pkg"
+    version = "1.2.2"
+    latest_version_mock = MagicMock(return_value={pkg_name: version})
+    current_version_mock = MagicMock(return_value={pkg_name: version})
+    install_mock = MagicMock(return_value={pkg_name: {"install status": "success"}})
+    salt_dict = {
+        "pkg.latest_version": latest_version_mock,
+        "pkg.version": current_version_mock,
+        "pkg.install": install_mock,
+    }
+    with patch.dict(pkg.__salt__, salt_dict):
+        ret = pkg.latest(pkg_name)
+        assert ret.get("result", False) is True

From d33730373113873899d1f55c03bdf9337b1a866d Mon Sep 17 00:00:00 2001
From: MKLeb <calebb@vmware.com>
Date: Mon, 11 Sep 2023 17:44:36 -0400
Subject: [PATCH 58/65] changelog

---
 changelog/65165.fixed.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog/65165.fixed.md

diff --git a/changelog/65165.fixed.md b/changelog/65165.fixed.md
new file mode 100644
index 00000000000..7b981a517f8
--- /dev/null
+++ b/changelog/65165.fixed.md
@@ -0,0 +1 @@
+Fix pkg.latest failing on windows for winrepo packages where the package is already up to date

From 2475f4fd143044b8ed7ba844580c6e0958f9cd49 Mon Sep 17 00:00:00 2001
From: Thomas Phipps <tphipps@vmware.com>
Date: Mon, 11 Sep 2023 22:57:37 +0000
Subject: [PATCH 59/65] rpm doenst need to check digest and signing when
 listing packages

---
 changelog/65152.fixed.md                      |  1 +
 salt/modules/yumpkg.py                        |  2 +
 .../pytests/functional/modules/test_yumpkg.py | 41 +++++++++++++++++++
 tests/pytests/unit/modules/test_yumpkg.py     | 15 ++++++-
 4 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 changelog/65152.fixed.md
 create mode 100644 tests/pytests/functional/modules/test_yumpkg.py

diff --git a/changelog/65152.fixed.md b/changelog/65152.fixed.md
new file mode 100644
index 00000000000..dfa2dac3462
--- /dev/null
+++ b/changelog/65152.fixed.md
@@ -0,0 +1 @@
+speed up yumpkg list_pkgs by not requiring digest or signature verification on lookup.
diff --git a/salt/modules/yumpkg.py b/salt/modules/yumpkg.py
index 281fc3bc223..192ea61635a 100644
--- a/salt/modules/yumpkg.py
+++ b/salt/modules/yumpkg.py
@@ -746,6 +746,8 @@ def list_pkgs(versions_as_list=False, **kwargs):
     cmd = [
         "rpm",
         "-qa",
+        "--nodigest",
+        "--nosignature",
         "--queryformat",
         salt.utils.pkg.rpm.QUERYFORMAT.replace("%{REPOID}", "(none)") + "\n",
     ]
diff --git a/tests/pytests/functional/modules/test_yumpkg.py b/tests/pytests/functional/modules/test_yumpkg.py
new file mode 100644
index 00000000000..36b357a6170
--- /dev/null
+++ b/tests/pytests/functional/modules/test_yumpkg.py
@@ -0,0 +1,41 @@
+import pytest
+
+import salt.modules.cmdmod
+import salt.modules.pkg_resource
+import salt.modules.yumpkg
+import salt.utils.pkg.rpm
+
+
+@pytest.fixture
+def configure_loader_modules(minion_opts):
+    return {
+        salt.modules.yumpkg: {
+            "__salt__": {
+                "cmd.run": salt.modules.cmdmod.run,
+                "pkg_resource.add_pkg": salt.modules.pkg_resource.add_pkg,
+                "pkg_resource.format_pkg_list": salt.modules.pkg_resource.format_pkg_list,
+            },
+            "__grains__": {"osarch": salt.utils.pkg.rpm.get_osarch()},
+        },
+    }
+
+
+@pytest.mark.slow_test
+def test_yum_list_pkgs(grains):
+    """
+    compare the output of rpm -qa vs the return of yumpkg.list_pkgs,
+    make sure that any changes to ympkg.list_pkgs still returns.
+    """
+
+    if grains["os_family"] != "RedHat":
+        pytest.skip("Skip if not RedHat")
+    cmd = [
+        "rpm",
+        "-qa",
+        "--queryformat",
+        "%{NAME}\n",
+    ]
+    known_pkgs = salt.modules.cmdmod.run(cmd, python_shell=False)
+    listed_pkgs = salt.modules.yumpkg.list_pkgs()
+    for line in known_pkgs.splitlines():
+        assert any(line in d for d in listed_pkgs)
diff --git a/tests/pytests/unit/modules/test_yumpkg.py b/tests/pytests/unit/modules/test_yumpkg.py
index 1354ee5d2d0..d2f3a2869ec 100644
--- a/tests/pytests/unit/modules/test_yumpkg.py
+++ b/tests/pytests/unit/modules/test_yumpkg.py
@@ -118,9 +118,10 @@ def test_list_pkgs():
         "openssh_|-(none)_|-6.6.1p1_|-33.el7_3_|-x86_64_|-(none)_|-1487838485",
         "virt-what_|-(none)_|-1.13_|-8.el7_|-x86_64_|-(none)_|-1487838486",
     ]
+    cmd_mod = MagicMock(return_value=os.linesep.join(rpm_out))
     with patch.dict(yumpkg.__grains__, {"osarch": "x86_64"}), patch.dict(
         yumpkg.__salt__,
-        {"cmd.run": MagicMock(return_value=os.linesep.join(rpm_out))},
+        {"cmd.run": cmd_mod},
     ), patch.dict(yumpkg.__salt__, {"pkg_resource.add_pkg": _add_data}), patch.dict(
         yumpkg.__salt__,
         {"pkg_resource.format_pkg_list": pkg_resource.format_pkg_list},
@@ -147,6 +148,18 @@ def test_list_pkgs():
         }.items():
             assert pkgs.get(pkg_name) is not None
             assert pkgs[pkg_name] == [pkg_version]
+        cmd_mod.assert_called_once_with(
+            [
+                "rpm",
+                "-qa",
+                "--nodigest",
+                "--nosignature",
+                "--queryformat",
+                "%{NAME}_|-%{EPOCH}_|-%{VERSION}_|-%{RELEASE}_|-%{ARCH}_|-(none)_|-%{INSTALLTIME}\n",
+            ],
+            output_loglevel="trace",
+            python_shell=False,
+        )
 
 
 def test_list_pkgs_no_context():

From 618d26013e7027fdda44cd69cf6280aa6cbeec91 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <palgarvio@vmware.com>
Date: Tue, 12 Sep 2023 10:40:09 +0100
Subject: [PATCH 60/65] Don't hardcode the page value

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
---
 tools/utils/gh.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/utils/gh.py b/tools/utils/gh.py
index 80fc8c63f35..0a6ef386f42 100644
--- a/tools/utils/gh.py
+++ b/tools/utils/gh.py
@@ -238,7 +238,7 @@ def download_artifact(
             page += 1
             params = {
                 "per_page": 100,
-                "page": 1,
+                "page": page,
             }
             ret = web.get(
                 f"https://api.github.com/repos/{repository}/actions/runs/{run_id}/artifacts",

From 866e40e12a284bb88fc7b9cae070f5c2e5ca952f Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <palgarvio@vmware.com>
Date: Tue, 12 Sep 2023 10:40:36 +0100
Subject: [PATCH 61/65] Give some additional information about what is going on

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
---
 tools/utils/__init__.py |  2 +-
 tools/utils/gh.py       | 39 ++++++++++++++++++++++++++++++++++-----
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/tools/utils/__init__.py b/tools/utils/__init__.py
index 26da49e1aae..f89633a668d 100644
--- a/tools/utils/__init__.py
+++ b/tools/utils/__init__.py
@@ -214,6 +214,7 @@ def download_file(
     auth: str | None = None,
     headers: dict[str, str] | None = None,
 ) -> pathlib.Path:
+    ctx.info(f"Downloading {dest.name!r} @ {url} ...")
     curl = shutil.which("curl")
     if curl is not None:
         command = [curl, "-sS", "-L"]
@@ -240,7 +241,6 @@ def download_file(
                 ctx.exit(1)
         return dest
     # NOTE the stream=True parameter below
-    ctx.info(f"Downloading {url} ...")
     with ctx.web as web:
         web.headers.update(headers)
         with web.get(url, stream=True, auth=auth) as r:
diff --git a/tools/utils/gh.py b/tools/utils/gh.py
index 0a6ef386f42..6f55d1de73a 100644
--- a/tools/utils/gh.py
+++ b/tools/utils/gh.py
@@ -63,6 +63,9 @@ def download_onedir_artifact(
         artifact_name += ".zip"
     else:
         artifact_name += ".tar.xz"
+    ctx.info(
+        f"Searching for artifact {artifact_name} from run_id {run_id} in repository {repository} ..."
+    )
     found_artifact_name = download_artifact(
         ctx,
         dest=artifacts_path,
@@ -73,15 +76,24 @@ def download_onedir_artifact(
     if found_artifact_name is None:
         return ExitCode.FAIL
     found_artifact_path = artifacts_path / found_artifact_name
+    checksum_algo = "sha512"
+    ctx.info(f"Validating {found_artifact_name!r} {checksum_algo} checksum ...")
     artifact_expected_checksum = (
-        artifacts_path.joinpath(f"{found_artifact_name}.SHA512").read_text().strip()
+        artifacts_path.joinpath(f"{found_artifact_name}.{checksum_algo.upper()}")
+        .read_text()
+        .strip()
+    )
+    artifact_checksum = tools.utils.get_file_checksum(
+        found_artifact_path, checksum_algo
     )
-    artifact_checksum = tools.utils.get_file_checksum(found_artifact_path, "sha512")
     if artifact_expected_checksum != artifact_checksum:
-        ctx.error("The 'sha512' checksum does not match")
+        ctx.error(f"The {checksum_algo} checksum does not match")
         ctx.error(f"{artifact_checksum!r} != {artifact_expected_checksum!r}")
         return ExitCode.FAIL
 
+    ctx.info(
+        f"Decompressing {found_artifact_name!r} to {artifacts_path.relative_to(tools.utils.REPO_ROOT)}{os.path.sep} ..."
+    )
     if found_artifact_path.suffix == ".zip":
         with zipfile.ZipFile(found_artifact_path) as zfile:
             zfile.extractall(path=artifacts_path)
@@ -112,6 +124,9 @@ def download_nox_artifact(
         )
         return ExitCode.SOFT_FAIL
     artifact_name = f"nox-{slug}-{nox_env}"
+    ctx.info(
+        f"Searching for artifact {artifact_name} from run_id {run_id} in repository {repository} ..."
+    )
     found_artifact_name = download_artifact(
         ctx,
         dest=tools.utils.REPO_ROOT,
@@ -181,6 +196,9 @@ def download_pkgs_artifact(
     artifacts_path = tools.utils.REPO_ROOT / "pkg" / "artifacts"
     artifacts_path.mkdir(exist_ok=True)
 
+    ctx.info(
+        f"Searching for artifact {artifact_name} from run_id {run_id} in repository {repository} ..."
+    )
     found_artifact_name = download_artifact(
         ctx,
         dest=artifacts_path,
@@ -229,9 +247,11 @@ def download_artifact(
         headers = {
             "Accept": "application/vnd.github+json",
             "Authorization": f"Bearer {github_token}",
+            "X-GitHub-Api-Version": "2022-11-28",
         }
         web.headers.update(headers)
         page = 0
+        listed_artifacts: set[str] = set()
         while True:
             if found_artifact is not None:
                 break
@@ -250,21 +270,30 @@ def download_artifact(
                 )
                 ctx.exit(1)
             data = ret.json()
+            if data["total_count"] <= len(listed_artifacts):
+                ctx.info("Already gone through all of the listed artifacts:")
+                ctx.print(sorted(listed_artifacts))
+                break
+            ctx.debug(f"Processing artifacts listing (page: {page}) ...")
             if not data["artifacts"]:
                 break
             for artifact in data["artifacts"]:
+                listed_artifacts.add(artifact["name"])
+                ctx.debug(
+                    f"Checking if {artifact['name']!r} matches {artifact_name!r} "
+                    f"({len(listed_artifacts)}/{data['total_count']}) ..."
+                )
                 if fnmatch.fnmatch(artifact["name"], artifact_name):
                     found_artifact = artifact["name"]
                     tempdir_path = pathlib.Path(tempfile.gettempdir())
                     download_url = artifact["archive_download_url"]
-                    ctx.info(f"Downloading {download_url}")
                     downloaded_artifact = tools.utils.download_file(
                         ctx,
                         download_url,
                         tempdir_path / f"{artifact['name']}.zip",
                         headers=headers,
                     )
-                    ctx.info("Downloaded", downloaded_artifact)
+                    ctx.info(f"Downloaded {downloaded_artifact}")
                     with zipfile.ZipFile(downloaded_artifact) as zfile:
                         zfile.extractall(path=dest)
                     break

From 24bd2879ff2fb44d9c98e1e53c8e53976ca1cb94 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <palgarvio@vmware.com>
Date: Tue, 12 Sep 2023 16:15:18 +0100
Subject: [PATCH 62/65] Show information for when a workflow run is not yet in
 the `completed` state

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
---
 tools/testsuite/__init__.py | 14 +++++++++++++-
 tools/utils/gh.py           |  7 +++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/tools/testsuite/__init__.py b/tools/testsuite/__init__.py
index 3de3ae30f0d..4ae4e07527c 100644
--- a/tools/testsuite/__init__.py
+++ b/tools/testsuite/__init__.py
@@ -125,7 +125,19 @@ def setup_testsuite(
         )
 
     if run_id is None:
-        ctx.error("Unable to find the appropriate workflow run ID")
+        run_id = tools.utils.gh.discover_run_id(
+            ctx,
+            branch=branch,
+            nightly=nightly,
+            pr=pr,
+            completed_status=False,
+        )
+        if run_id is None:
+            ctx.error("Unable to find the appropriate workflow run ID")
+        else:
+            ctx.warn(
+                f"Looks like we found run_id {run_id} but it's not yet in the completed state"
+            )
         ctx.exit(1)
 
     exitcode = tools.utils.gh.download_onedir_artifact(
diff --git a/tools/utils/gh.py b/tools/utils/gh.py
index 6f55d1de73a..91c78eff023 100644
--- a/tools/utils/gh.py
+++ b/tools/utils/gh.py
@@ -308,22 +308,25 @@ def discover_run_id(
     nightly: str = None,
     pr: int = None,
     repository: str = "saltstack/salt",
+    completed_status: bool = True,
 ) -> int | None:
     ctx.info(f"Discovering the run_id({branch=}, {nightly=}, {pr=}, {repository=})")
     run_id: int | None = None
     with ctx.web as web:
         headers = {
             "Accept": "application/vnd.github+json",
+            "X-GitHub-Api-Version": "2022-11-28",
         }
         github_token = get_github_token(ctx)
         if github_token is not None:
             headers["Authorization"] = f"Bearer {github_token}"
         web.headers.update(headers)
 
-        params = {
+        params: dict[str, str | int] = {
             "per_page": 100,
-            "status": "completed",
         }
+        if completed_status is True:
+            params["status"] = "completed"
         if branch is not None:
             ret = web.get(
                 f"https://api.github.com/repos/{repository}/git/ref/heads/{branch}"

From dd511289d146a267a7760b49acdd510e67caf79b Mon Sep 17 00:00:00 2001
From: cmcmarrow <charles.mcmarrow.4@gmail.com>
Date: Wed, 6 Sep 2023 16:42:49 -0500
Subject: [PATCH 63/65] move lock

---
 salt/utils/gitfs.py                           |  3 +-
 tests/pytests/functional/utils/test_gitfs.py  | 35 +++++++++++++++++++
 tests/pytests/functional/utils/test_pillar.py | 35 +++++++++++++++++++
 .../pytests/functional/utils/test_winrepo.py  | 35 +++++++++++++++++++
 4 files changed, 106 insertions(+), 2 deletions(-)

diff --git a/salt/utils/gitfs.py b/salt/utils/gitfs.py
index 96a4185704c..f15b8316e75 100644
--- a/salt/utils/gitfs.py
+++ b/salt/utils/gitfs.py
@@ -565,7 +565,7 @@ class GitProvider:
         return ret
 
     def _get_lock_file(self, lock_type="update"):
-        return salt.utils.path.join(self.gitdir, lock_type + ".lk")
+        return salt.utils.path.join(self._salt_working_dir, lock_type + ".lk")
 
     @classmethod
     def add_conf_overlay(cls, name):
@@ -857,7 +857,6 @@ class GitProvider:
                     self.id,
                     desired_ssl_verify,
                 )
-                self._ssl_verfiy = self.opts.get(f"{self.role}_ssl_verify", None)
                 conf_changed = True
 
             # Write changes, if necessary
diff --git a/tests/pytests/functional/utils/test_gitfs.py b/tests/pytests/functional/utils/test_gitfs.py
index fba68a17161..30a5f147faa 100644
--- a/tests/pytests/functional/utils/test_gitfs.py
+++ b/tests/pytests/functional/utils/test_gitfs.py
@@ -238,3 +238,38 @@ def test_gitpython_remote_map(gitpython_gitfs_opts):
 @skipif_no_pygit2
 def test_pygit2_remote_map(pygit2_gitfs_opts):
     _test_remote_map(pygit2_gitfs_opts)
+
+
+def _test_lock(opts):
+    g = _get_gitfs(
+        opts,
+        "https://github.com/saltstack/salt-test-pillar-gitfs.git",
+    )
+    g.fetch_remotes()
+    assert len(g.remotes) == 1
+    repo = g.remotes[0]
+    assert repo.get_salt_working_dir() in repo._get_lock_file()
+    assert repo.lock() == (
+        [
+            "Set update lock for gitfs remote 'https://github.com/saltstack/salt-test-pillar-gitfs.git'"
+        ],
+        [],
+    )
+    assert os.path.isfile(repo._get_lock_file())
+    assert repo.clear_lock() == (
+        [
+            "Removed update lock for gitfs remote 'https://github.com/saltstack/salt-test-pillar-gitfs.git'"
+        ],
+        [],
+    )
+    assert not os.path.isfile(repo._get_lock_file())
+
+
+@skipif_no_gitpython
+def test_gitpython_lock(gitpython_gitfs_opts):
+    _test_lock(gitpython_gitfs_opts)
+
+
+@skipif_no_pygit2
+def test_pygit2_lock(pygit2_gitfs_opts):
+    _test_lock(pygit2_gitfs_opts)
diff --git a/tests/pytests/functional/utils/test_pillar.py b/tests/pytests/functional/utils/test_pillar.py
index d274ff6db5b..143edbf6ff5 100644
--- a/tests/pytests/functional/utils/test_pillar.py
+++ b/tests/pytests/functional/utils/test_pillar.py
@@ -328,3 +328,38 @@ def test_gitpython_remote_map(gitpython_pillar_opts):
 @skipif_no_pygit2
 def test_pygit2_remote_map(pygit2_pillar_opts):
     _test_remote_map(pygit2_pillar_opts)
+
+
+def _test_lock(opts):
+    p = _get_pillar(
+        opts,
+        "https://github.com/saltstack/salt-test-pillar-gitfs.git",
+    )
+    p.fetch_remotes()
+    assert len(p.remotes) == 1
+    repo = p.remotes[0]
+    assert repo.get_salt_working_dir() in repo._get_lock_file()
+    assert repo.lock() == (
+        [
+            "Set update lock for git_pillar remote 'https://github.com/saltstack/salt-test-pillar-gitfs.git'"
+        ],
+        [],
+    )
+    assert os.path.isfile(repo._get_lock_file())
+    assert repo.clear_lock() == (
+        [
+            "Removed update lock for git_pillar remote 'https://github.com/saltstack/salt-test-pillar-gitfs.git'"
+        ],
+        [],
+    )
+    assert not os.path.isfile(repo._get_lock_file())
+
+
+@skipif_no_gitpython
+def test_gitpython_lock(gitpython_pillar_opts):
+    _test_lock(gitpython_pillar_opts)
+
+
+@skipif_no_pygit2
+def test_pygit2_lock(pygit2_pillar_opts):
+    _test_lock(pygit2_pillar_opts)
diff --git a/tests/pytests/functional/utils/test_winrepo.py b/tests/pytests/functional/utils/test_winrepo.py
index 33897ca4b35..117d995bba6 100644
--- a/tests/pytests/functional/utils/test_winrepo.py
+++ b/tests/pytests/functional/utils/test_winrepo.py
@@ -127,3 +127,38 @@ def test_gitpython_remote_map(gitpython_winrepo_opts):
 @skipif_no_pygit2
 def test_pygit2_remote_map(pygit2_winrepo_opts):
     _test_remote_map(pygit2_winrepo_opts)
+
+
+def _test_lock(opts):
+    w = _get_winrepo(
+        opts,
+        "https://github.com/saltstack/salt-test-pillar-gitfs.git",
+    )
+    w.fetch_remotes()
+    assert len(w.remotes) == 1
+    repo = w.remotes[0]
+    assert repo.get_salt_working_dir() in repo._get_lock_file()
+    assert repo.lock() == (
+        [
+            "Set update lock for winrepo remote 'https://github.com/saltstack/salt-test-pillar-gitfs.git'"
+        ],
+        [],
+    )
+    assert os.path.isfile(repo._get_lock_file())
+    assert repo.clear_lock() == (
+        [
+            "Removed update lock for winrepo remote 'https://github.com/saltstack/salt-test-pillar-gitfs.git'"
+        ],
+        [],
+    )
+    assert not os.path.isfile(repo._get_lock_file())
+
+
+@skipif_no_gitpython
+def test_gitpython_lock(gitpython_winrepo_opts):
+    _test_lock(gitpython_winrepo_opts)
+
+
+@skipif_no_pygit2
+def test_pygit2_lock(pygit2_winrepo_opts):
+    _test_lock(pygit2_winrepo_opts)

From fdaccae47674a53385dcf5a0a358f22a9b63696e Mon Sep 17 00:00:00 2001
From: cmcmarrow <charles.mcmarrow.4@gmail.com>
Date: Wed, 6 Sep 2023 16:49:57 -0500
Subject: [PATCH 64/65] add 65086 changelog

---
 changelog/65086.fixed.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog/65086.fixed.md

diff --git a/changelog/65086.fixed.md b/changelog/65086.fixed.md
new file mode 100644
index 00000000000..292930f0fd4
--- /dev/null
+++ b/changelog/65086.fixed.md
@@ -0,0 +1 @@
+Moved gitfs locks to salt working dir to avoid lock wipes

From a094e78f00d23cf859c6c9997f6c3d841123b887 Mon Sep 17 00:00:00 2001
From: twangboy <shane.d.lee@gmail.com>
Date: Tue, 12 Sep 2023 15:27:04 -0600
Subject: [PATCH 65/65] Update notarize.sh to use new notary tool

---
 pkg/macos/notarize.sh | 162 ++++++++++++------------------------------
 1 file changed, 44 insertions(+), 118 deletions(-)

diff --git a/pkg/macos/notarize.sh b/pkg/macos/notarize.sh
index 1b031593121..87c9cf2adeb 100755
--- a/pkg/macos/notarize.sh
+++ b/pkg/macos/notarize.sh
@@ -6,17 +6,19 @@
 # Date: December 2020
 #
 # Description: This notarizes the macOS Installer Package (.pkg). It uses the
-#              `altool` xcode utility which is only available in the full
-#              Xcode package. It is not available in Command Line Tools.
+#              `notarytool` xcode utility which became available in Xcode 13.
+#              Xcode 13 requires macOS Big Sur 11.3 or higher. However, the
+#              notarytool binary can be extracted and run on macOS Catalina
+#              10.15.7 and higher. It is not available in Command Line Tools.
 #
 #              This script will upload a copy of the package to Apple and wait
 #              for the notarization to return. This can take several minutes.
 #
-#              If this command is run with sudo, you need to pass the `-E`
-#              option to make sure the environment variables pass through to the
-#              sudo environment. For example:
+#              This script requires the presence of some environment variables.
+#              If running this script with sudo, be sure to pass the `-E`
+#              option.
 #
-#              sudo -E ./notarize.sh
+#              sudo -E ./notarize.sh salt-3006.2-signed.pkg
 #
 # Requirements:
 #     - Full Xcode Installation
@@ -31,24 +33,26 @@
 #             The package that will be notarized (must be signed)
 #
 #     Example:
-#         The following will notarize the 'salt-3006.1-1-signed.pkg' file
+#         The following will notarize the 'salt-3006.2-signed.pkg' file:
 #
-#         ./notarize.sh salt-3006.1-1-signed.pkg
+#         ./notarize.sh salt-3006.2-signed.pkg
 #
 # Environment Setup:
 #
 #     Define Environment Variables:
-#         Create two environment variables for the Apple account and the
-#         app-specific password associated with that account. To generate the
-#         app-specific password see: https://support.apple.com/en-us/HT204397
+#         Create three environment variables for the apple account, apple team
+#         ID, and the app-specific password associated with that account. To
+#         generate the app-specific password see:
+#         https://support.apple.com/en-us/HT204397
 #
 #         export APPLE_ACCT="username@domain.com"
+#         export APPLE_TEAM_ID="AB283DVDS5"
 #         export APP_SPEC_PWD="abcd-efgh-ijkl-mnop"
 #
 ################################################################################
 
 #-------------------------------------------------------------------------------
-# Variables
+# Check input parameters
 #-------------------------------------------------------------------------------
 if [ "$1" == "" ]; then
     echo "Must supply a package to notarize"
@@ -57,28 +61,9 @@ else
     PACKAGE=$1
 fi
 
-BUNDLE_ID="com.saltstack.salt"
-CMD_OUTPUT=$(mktemp -t cmd.log)
-
 #-------------------------------------------------------------------------------
 # Functions
 #-------------------------------------------------------------------------------
-# _usage
-#
-#   Prints out help text
-_usage() {
-     echo ""
-     echo "Script to notarize the Salt package:"
-     echo ""
-     echo "usage: ${0}"
-     echo "             [-h|--help]"
-     echo ""
-     echo "  -h, --help      this message"
-     echo ""
-     echo "  To notarize the Salt package:"
-     echo "      example: $0 salt-3006.1-1-signed.pkg"
-}
-
 # _msg
 #
 #   Prints the message with a dash... no new line
@@ -99,38 +84,32 @@ _success() {
 _failure() {
     printf "\e[31m%s\e[0m\n" "Failure"
     echo "output >>>>>>"
-    cat "$CMD_OUTPUT" 1>&2
+    cat "$NOTARIZE_LOG" 1>&2
     echo "<<<<<< output"
     exit 1
 }
 
 #-------------------------------------------------------------------------------
-# Get Parameters
+# Environment Variables
 #-------------------------------------------------------------------------------
-while true; do
-    if [[ -z "$1" ]]; then break; fi
-    case "$1" in
-        -h | --help )
-            _usage
-            exit 0
-            ;;
-        -*)
-            echo "Invalid Option: $1"
-            echo ""
-            _usage
-            exit 1
-            ;;
-        * )
-            shift
-            ;;
-    esac
-done
+_msg "Setting Variables"
+NOTARIZE_LOG=$(mktemp -t notarize-app.log)
+NOTARY_TOOL=$(xcrun --find notarytool)
+_success
+
+#-------------------------------------------------------------------------------
+# Check for notarytool
+#-------------------------------------------------------------------------------
+if [ ! -f "$NOTARY_TOOL" ]; then
+    echo "This script requires the NotaryTool binary"
+    exit 1
+fi
 
 #-------------------------------------------------------------------------------
 # Delete temporary files on exit
 #-------------------------------------------------------------------------------
 function finish {
-    rm "$CMD_OUTPUT"
+    rm "$NOTARIZE_LOG"
 }
 trap finish EXIT
 
@@ -139,87 +118,34 @@ trap finish EXIT
 #-------------------------------------------------------------------------------
 printf "=%.0s" {1..80}; printf "\n"
 echo "Notarize Salt Package"
+echo "- This can take up to 30 minutes"
 printf -- "-%.0s" {1..80}; printf "\n"
 
 #-------------------------------------------------------------------------------
 # Submit app for notarization
 #-------------------------------------------------------------------------------
-_msg "Submitting package for notarization"
-if xcrun altool --notarize-app \
-                --primary-bundle-id "$BUNDLE_ID" \
-                --username "$APPLE_ACCT" \
-                --password "$APP_SPEC_PWD" \
-                -f "$PACKAGE" > "$CMD_OUTPUT" 2>&1; then
+_msg "Submitting Package for Notarization"
+if $NOTARY_TOOL submit \
+        --apple-id "$APPLE_ACCT" \
+        --team-id "$APPLE_TEAM_ID" \
+        --password "$APP_SPEC_PWD" \
+        --wait \
+        "$PACKAGE" > "$NOTARIZE_LOG" 2>&1; then
     _success
 else
     _failure
 fi
 
-# Get RequestUUID from the CMD_OUTPUT
-# Uncomment for debugging
-# cat "$CMD_OUTPUT"
-
-_msg "Verifying successful upload"
-if grep -q "No errors uploading" "$CMD_OUTPUT"; then
+# Make sure the status is "Accepted", then staple
+_msg "Verifying accepted status"
+if grep -q "status: Accepted" "$NOTARIZE_LOG"; then
     _success
 else
-    echo ">>>>>> Failed Uploading Package <<<<<<" > "$CMD_OUTPUT"
     _failure
 fi
-RequestUUID=$(awk -F ' = ' '/RequestUUID/ {print $2}' "$CMD_OUTPUT")
 
-# Clear CMD_OUTPUT
-echo "" > "$CMD_OUTPUT"
-
-echo "- Checking Notarization Status (every 30 seconds):"
-echo -n "  "
-# Though it usually takes 5 minutes, notarization can take up to 30 minutes
-# Check status every 30 seconds for 40 minutes
-tries=0
-while sleep 30; do
-    ((tries++))
-    echo -n "."
-
-    # check notarization status
-    if ! xcrun altool --notarization-info "$RequestUUID" \
-                      --username "$APPLE_ACCT" \
-                      --password "$APP_SPEC_PWD" > "$CMD_OUTPUT" 2>&1; then
-        echo ""
-        cat "$CMD_OUTPUT" 1>&2
-        exit 1
-    fi
-
-    # Look for Status in the CMD_OUTPUT
-    # Uncomment for debugging
-    # cat "$CMD_OUTPUT"
-
-    # Continue checking until Status is no longer "in progress"
-    if ! grep -q "Status: in progress" "$CMD_OUTPUT"; then
-        echo ""
-        break
-    fi
-
-    if (( tries > 80 )); then
-        echo ""
-        echo "Failed after 40 minutes"
-        echo "Log: $CMD_OUTPUT"
-        cat "$CMD_OUTPUT" 1>&2
-        exit 1
-    fi
-
-done
-
-# Make sure the result is "success", then staple
-if ! grep -q "Status: success" "$CMD_OUTPUT"; then
-    echo "**** There was a problem notarizing the package"
-    echo "**** View the log for details:"
-    awk -F ': ' '/LogFileURL/ {print $2}' "$CMD_OUTPUT"
-    exit 1
-fi
-echo "  Notarization Complete"
-
-_msg "Stapling notarization to the package"
-if xcrun stapler staple "$PACKAGE" > "$CMD_OUTPUT"; then
+_msg "Stapling Notarization to the Package"
+if xcrun stapler staple "$PACKAGE" > "$NOTARIZE_LOG"; then
     _success
 else
     _failure