saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Only show the warnings when running the download package tests

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2023-04-15 17:28:31 +01:00 • committed by Pedro Algarvio
parent f56dfae0c0
commit d33a8b7b4a
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
noxfile.py
View file

@ -1790,6 +1790,7 @@ def test_pkgs_onedir(session):
env = { env = {
"ONEDIR_TESTRUN": "1", "ONEDIR_TESTRUN": "1",
"PKG_TEST_TYPE": chunk,
} }
if chunk == "upgrade-classic": if chunk == "upgrade-classic":

13
pkg/tests/download/test_pkg_download.py
View file

@ -257,13 +257,16 @@ def root_url(salt_release):
def get_salt_release(): def get_salt_release():
salt_release = os.environ.get("SALT_RELEASE") salt_release = os.environ.get("SALT_RELEASE")
pkg_test_type = os.environ.get("PKG_TEST_TYPE", "install")
if salt_release is None: if salt_release is None:
log.warning( if pkg_test_type == "download-pkgs":
"Setting salt release to 3006.0rc2 which is probably not what you want." log.warning(
) "Setting salt release to 3006.0rc2 which is probably not what you want."
)
salt_release = "3006.0rc2" salt_release = "3006.0rc2"
if packaging.version.parse(salt_release) < packaging.version.parse("3006.0rc1"): if pkg_test_type == "download-pkgs":
log.warning(f"The salt release being tested, {salt_release!r} looks off.") if packaging.version.parse(salt_release) < packaging.version.parse("3006.0rc1"):
log.warning(f"The salt release being tested, {salt_release!r} looks off.")
return salt_release return salt_release