Move debian build to doca-sosreport

add sos-mlx-cloud-verification.conf to repo and debian build

debian/changelog

@@ -1,3 +1,9 @@
+doca-sosreport (4.8.0-1) unstable; urgency=low
+
+  * replace sosreport with doca-sosreport
+
+ -- Michael Filanov <[email protected]>  Thu, 27 Jun 2024 14:40:01 +0100
+
 sosreport (4.7.2) noble; urgency=medium
 
   * New upstream release

debian/control

@@ -1,10 +1,10 @@
-Source: sosreport
-Maintainer: David Negreira <david.negreira@canonical.com>
+Source: doca-sosreport
+Maintainer: Michael Filanov <mfilanov@nvidia.com>
 Section: admin
 Priority: optional
-Standards-Version: 4.5.1
+Standards-Version: 4.6.1
 Build-Depends:
- debhelper-compat (= 13),
+ debhelper-compat (= 12),
  dh-python,
  gettext,
  python3-all,
@@ -16,14 +16,19 @@ Build-Depends:
  python3-pexpect,
  python3-packaging,
  python3-yaml,
-Homepage: https://github.com/sosreport/sos
+Homepage: https://github.com/nvidia/doca-sosreport
 Vcs-Browser: https://salsa.debian.org/sosreport-team/sosreport
 Vcs-Git: https://salsa.debian.org/sosreport-team/sosreport.git
 X-Python3-Version: >= 3.6
 
-Package: sosreport
+Package: doca-sosreport
 Architecture: any
 Depends: ${python3:Depends}, ${misc:Depends}, python3-pexpect, python3-magic, python3-packaging, python3-boto3
+rovides: doca-sosreport (= ${source:Version}),
+          sosreport
+Conflicts: sosreport
+Replaces: sosreport,
+          doca-sosreport (<< ${source:Version})
 Description: Set of tools to gather troubleshooting data from a system
  Sos is a set of tools that gathers information about system
  hardware and configuration. The information can then be used for

debian/install

@@ -1 +1,2 @@
 sos.conf etc/sos/
+sos-mlx-cloud-verification.conf etc/sos/

debian/rules

@@ -1,15 +1,17 @@
 #!/usr/bin/make -f
 
-export PYBUILD_NAME=sosreport
+export PYBUILD_NAME=doca-sosreport
+export PYBUILD_SYSTEM=distutils
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild
 
 override_dh_install:
 	# Move config file to the right location.
-	mv debian/sosreport/usr/config/sos.conf debian/sosreport/etc/sos/sos.conf
+	mv debian/doca-sosreport/usr/config/sos.conf debian/doca-sosreport/etc/sos/sos.conf
+	mv debian/doca-sosreport/usr/config/sos-mlx-cloud-verification.conf debian/doca-sosreport/etc/sos/sos-mlx-cloud-verification.conf
 	# Remove unnecessary unused dir.
-	rm -rf debian/sosreport/usr/config
+	rm -rf debian/doca-sosreport/usr/config
 
 override_dh_auto_test:
 	nosetests3 -v --with-cover --cover-package=sos tests/unittests --ignore-files="policy_tests\.py"

setup.py

@@ -5,7 +5,7 @@
 
 
 setup(
-    name='sos',
+    name='doca-sosreport',
     version=VERSION,
     # to avoid a packaging dependency on older RHELs
     # we only declare it on recent Python versions
@@ -26,9 +26,10 @@
                             'man/en/sos-collector.1', 'man/en/sos-clean.1',
                             'man/en/sos-mask.1', 'man/en/sos-help.1']),
         ('share/man/man5', ['man/en/sos.conf.5']),
-        ('share/licenses/sos', ['LICENSE']),
-        ('share/doc/sos', ['AUTHORS', 'README.md']),
-        ('config', ['sos.conf', 'tmpfiles/tmpfilesd-sos-rh.conf'])
+        ('share/licenses/doca-sosreport', ['LICENSE']),
+        ('share/doc/doca-sosreport', ['AUTHORS', 'README.md']),
+        ('config', ['sos.conf', 'sos-mlx-cloud-verification.conf',
+                    'tmpfiles/tmpfilesd-sos-rh.conf'])
     ],
     packages=find_packages(include=['sos', 'sos.*'])
 )

sos-mlx-cloud-verification.conf

@@ -0,0 +1,40 @@
+[global]
+# Set global options here that are not component specific
+# If you would like one global default value to be specifically overridden for
+# just one component, but not others, you may override that value in the
+# component specific section below
+#verbose = 3
+#verify = yes
+batch = yes
+log-size = 10
+journal_size = 10
+plugin_timeout = 120
+cmd_timeout = 30
+low_priority = True
+
+[report]
+# Options that will apply to any `sos report` run should be listed here.
+# Note that the option names *must* be the long-form name as seen in --help
+# output. Use a comma for list delimitations.
+skip-plugins = ssh, flatpack, login
+enable-plugins = rdma
+
+[collect]
+# Options that will apply to any `sos collect` run should be listed here.
+# Note that the option names *must* be the long-form name as seen in --help
+# output. Use a comma for list delimitations
+#primary = myhost.example.com
+#ssh-key = /home/user/.ssh/mykey
+#password = true
+
+[clean]
+# Options that will apply to any `sos clean|mask` run should be listed here.
+# Note that the option names *must* be the long-form name as seen in --help
+# output. Use a comma for list delimitations
+#domains = mydomain.com
+#no-update = true
+
+[plugin_options]
+# Specify any plugin options and their values here. These options take the form
+# plugin_name.option_name = value
+#rpm.rpmva = off

sos/__init__.py

@@ -14,7 +14,7 @@
 This module houses the i18n setup and message function. The default is to use
 gettext to internationalize messages.
 """
-__version__ = "4.7.2"
+__version__ = "4.8.0"
 
 import os
 import sys