build,salt: allow to pass a version constraint for packages

Instead of passing the exact version, we can now provide
a constraint (<, >, <=, >=) if we don't need a specific
version but we want to exclude some.

Refs: #3387

Author: alexandre-allard

buildchain/buildchain/versions.py

@@ -22,6 +22,7 @@
 SALT_VERSION       : str = '3002.6'
 CONTAINERD_VERSION : str = '1.4.3'
 CONTAINERD_RELEASE : str = '2.el7'
+SOS_VERSION        : str = '<4.0'
 
 def load_version_information() -> None:
     """Load version information from `VERSION`."""
@@ -331,7 +332,8 @@ def deb_full_name(self) -> str:
         PackageVersion(name='runc'),
         PackageVersion(name='salt-minion', version=SALT_VERSION),
         PackageVersion(name='socat'),
-        PackageVersion(name='sos'),  # TODO download built package dependencies
+        # TODO download built package dependencies
+        PackageVersion(name='sos', version=SOS_VERSION),
         PackageVersion(name='util-linux'),
         PackageVersion(name='xfsprogs'),
     ),

salt/_modules/metalk8s_package_manager_yum.py

@@ -169,7 +169,8 @@ def check_pkg_availability(pkgs_info, exclude=None):
     for name, info in pkgs_info.items():
         pkg_name = name
         if info.get('version'):
-            pkg_name += '-' + str(info['version'])
+            pkg_name += "-" if info["version"][0].isgidit() else " "
+            pkg_name += str(info['version'])
 
         cmd = [
             'yum', 'install', pkg_name,
@@ -185,8 +186,9 @@ def check_pkg_availability(pkgs_info, exclude=None):
 
         if ret['retcode'] != 0:
             raise CommandExecutionError(
-                'Check availability of package {} failed: {}'.format(
+                'Check availability of package {} failed:\n{}\n{}'.format(
                     pkg_name,
-                    ret['stdout']
+                    ret['stdout'],
+                    ret['stderr'],
                 )
             )