diff --git a/.cirrus.yml b/.cirrus.yml index e51665872b..bd33307cad 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -144,10 +144,49 @@ deb_build_task: pip3 install -r test-requirements.txt --break-system-packages main_script: | dpkg-buildpackage -b -us -uc -rfakeroot -m --build-by="noreply@canonical.com" - prep_artifacts_script: mv ../*.deb ./sos_cirrus.deb + prep_artifacts_script: | + mv ../*.deb ./sos_cirrus.deb + mv ../*.buildinfo ./sos_cirrus.buildinfo + mv ../*.changes ./sos_cirrus.changes + tar cf sos_cirrus_deb.tgz ./sos_cirrus.buildinfo ./sos_cirrus.changes packages_artifacts: path: ./sos_cirrus.deb type: application/octet-stream + pkgsrc_artifects: + path: ./sos_cirrus_deb.tgz + +# Run lintian on the deb package sources +deb_lintian_task: + alias: "deb_lintian" + name: "deb lintian from Checkout build" + depends_on: + - deb_build + gce_instance: + image_project: "${UBUNTU_PROJECT}" + image_name: "${UBUNTU_DEB_IMAGE_NAME}" + type: e2-micro + setup_script: | + apt update --allow-releaseinfo-change + apt -y install lintian + $ARTCURL/deb%20Build%20From%20Checkout/pkgsrc/sos_cirrus_deb.tgz + tar xf sos_cirrus_deb.tgz + main_script: + lintian -v -i -I -E --pedantic --profile debian sos_cirrus.changes + +# Check license of all files based on debian/copyright file +deb_license_check_task: + alias: "deb_license_check" + name: "deb license check from Checkout" + allow_failures: true + gce_instance: + image_project: "${UBUNTU_PROJECT}" + image_name: "${UBUNTU_DEB_IMAGE_NAME}" + type: e2-micro + setup_script: | + apt update --allow-releaseinfo-change + apt -y install licenserecon + main_script: + lrc # Make sure a user can manually build a snap from the checkout snap_build_task: diff --git a/debian/control b/debian/control index 4655ecc2c3..568c811891 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,8 @@ Source: sosreport Maintainer: David Negreira Section: admin Priority: optional -Standards-Version: 4.5.1 +Standards-Version: 4.7.0 +Rules-Requires-Root: no Build-Depends: debhelper-compat (= 13), dh-python, @@ -19,11 +20,11 @@ Build-Depends: Homepage: https://github.com/sosreport/sos 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 Architecture: any -Depends: ${python3:Depends}, ${misc:Depends}, python3-pexpect, python3-magic, python3-packaging, python3-boto3 +Depends: ${python3:Depends}, ${misc:Depends}, python3-pexpect, python3-magic, python3-packaging +Recommends: python3-boto3 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 diff --git a/debian/copyright b/debian/copyright index 921c89370d..a67c20358b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,6 +3,16 @@ Upstream-Name: sosreport Upstream-Contact: Jake Hunsaker Source: https://github.com/sosreport/sos +Files: * +Copyright: 2007-2024 Upstream +License: GPL-2+ + +Files: debian/* +Copyright: + 2013 Adam Stokes + 2023-2024 Canonical Ltd. +License: GPL-2+ + License: GPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by