Skip to content

Conversation

@pmoravec
Copy link
Contributor

The fix is three-fold:

  • obfuscate_file must clean file content and not filename
  • cleaner's main_archive must be populated by parsers first
  • obfuscate_file dont need short_name as it is always called with implicit value of short_name that cleaner will strip itself

Closes: #4109
Closes: #4110


Please place an 'X' inside each '[]' to confirm you adhere to our Contributor Guidelines

  • Is the commit message split over multiple lines and hard-wrapped at 72 characters?
  • Is the subject and message clear and concise?
  • Does the subject start with [plugin_name] if submitting a plugin patch or a [section_name] if part of the core sosreport code?
  • Does the commit contain a Signed-off-by: First Lastname email@example.com?
  • Are any related Issues or existing PRs properly referenced via a Closes (Issue) or Resolved (PR) line?
  • Are all passwords or private data gathered by this PR obfuscated?

The fix is three-fold:
- obfuscate_file must clean file content and not filename
- cleaner's main_archive must be populated by parsers first
- obfuscate_file dont need short_name as it is always called with
  implicit value of short_name that cleaner will strip itself

Closes: sosreport#4109
Closes: sosreport#4110

Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
@packit-as-a-service
Copy link

Congratulations! One of the builds has completed. 🍾

You can install the built RPMs by following these steps:

  • sudo yum install -y dnf-plugins-core on RHEL 8
  • sudo dnf install -y dnf-plugins-core on Fedora
  • dnf copr enable packit/sosreport-sos-4110
  • And now you can install the packages.

Please note that the RPMs should be used only in a testing environment.

Copy link
Member

@TurboTurtle TurboTurtle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🫠

@bryanfraschetti
Copy link
Contributor

Summary                                                                                                                                                                                                          │
                                                                                                                                                                                                                 │
 failures false          time 3          Size 0.00MiB    List plugins                                                                                                                                            │
 failures false          time 2          Size 0.00MiB    List presets                                                                                                                                            │
 failures false          time 3          Size 0.00MiB    List profiles                                                                                                                                           │
 failures false          time 3          Size 0.00MiB    --build -t1 -o host,kernel,filesys,hardware,date,logs                                                                                                   │
 failures false          time 7          Size 1.47MiB    -vvv                                                                                                                                                    │
 failures false          time 8          Size 1.44MiB    -e opencl -v -k kernel.with-timer,libraries.ldconfigv --no-postproc                                                                                     │
 failures false          time 2          Size 14.75KiB   --no-report --label TEST -o hardware                                                                                                                    │
 failures false          time 5          Size 1.73MiB    --log-size 0 --no-env-vars -z gzip                                                                                                                      │
 failures false          time 8          Size 1.37MiB    --mask                                                                                                                                                  │
Everything worked!                                                                                                                                                                                               │
autopkgtest [19:01:42]: test simple.sh: -----------------------]                                                                                                                                                 │
autopkgtest [19:01:42]: test simple.sh:  - - - - - - - - - - results - - - - - - - - - -                                                                                                                         │
simple.sh            PASS                                                                                                                                                                                        │
autopkgtest [19:01:42]: @@@@@@@@@@@@@@@@@@@@ summary                                                                                                                                                             │
simple.sh            PASS                                                                                                                                                                                        │
                                                                                                                                                                                                                 │
I: Autopkgtest run was successful.                                                                                                                                                                               │
                                                                                                                                                                                                                 │
+------------------------------------------------------------------------------+                                                                                                                                 │
| Cleanup                                      Wed, 20 Aug 2025 19:01:43 +0000 |                                                                                                                                 │
+------------------------------------------------------------------------------+                                                                                                                                 │
                                                                                                                                                                                                                 │
Purging /build/reproducible-path                                                                                                                                                                                 │
Not cleaning session: cloned chroot in use                                                                                                                                                                       │
                                                                                                                                                                                                                 │
+------------------------------------------------------------------------------+                                                                                                                                 │
| Summary                                      Wed, 20 Aug 2025 19:01:44 +0000 |                                                                                                                                 │
+------------------------------------------------------------------------------+                                                                                                                                 │
                                                                                                                                                                                                                 │
Autopkgtest: pass                                                                                                                                                                                                │
Build Architecture: amd64                                                                                                                                                                                        │
Build Type: full                                                                                                                                                                                                 │
Build-Space: 35820                                                                                                                                                                                               │
Build-Time: 12                                                                                                                                                                                                   │
Distribution: unstable                                                                                                                                                                                           │
Host Architecture: amd64                                                                                                                                                                                         │
Install-Time: 19                                                                                                                                                                                                 │
Job: /root/sos_4.10.0-0.1.dsc                                                                                                                                                                                    │
Lintian: warn                                                                                                                                                                                                    │
Machine Architecture: amd64                                                                                                                                                                                      │
Package: sos                                                                                                                                                                                                     │
Package-Time: 40                                                                                                                                                                                                 │
Piuparts: fail                                                                                                                                                                                                   │
Source-Version: 4.10.0-0.1                                                                                                                                                                                       │
Space: 35820                                                                                                                                                                                                     │
Status: successful                                                                                                                                                                                               │
Version: 4.10.0-0.1                                                                                                                                                                                              │
--------------------------------------------------------------------------------                                                                                                                                 │
Finished at 2025-08-20T19:00:04Z                                                                                                                                                                                 │
Build needed 00:00:40, 35820k disk space                                                                                                                                                                         │

Thanks! This seems to have fixed the failing test

@TurboTurtle TurboTurtle added Reviewed/Ready for Merge Has been reviewed, ready for merge Kind/cleaner cleaner component of sos labels Aug 20, 2025
@TurboTurtle TurboTurtle merged commit 3efc888 into sosreport:main Aug 20, 2025
42 checks passed
pafernanr pushed a commit to pafernanr/sos that referenced this pull request Oct 2, 2025
The fix is three-fold:
- obfuscate_file must clean file content and not filename
- cleaner's main_archive must be populated by parsers first
- obfuscate_file dont need short_name as it is always called with
  implicit value of short_name that cleaner will strip itself

Closes: sosreport#4109
Closes: sosreport#4110

Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
dwolstroRH pushed a commit to dwolstroRH/sos that referenced this pull request Nov 5, 2025
The fix is three-fold:
- obfuscate_file must clean file content and not filename
- cleaner's main_archive must be populated by parsers first
- obfuscate_file dont need short_name as it is always called with
  implicit value of short_name that cleaner will strip itself

Closes: sosreport#4109
Closes: sosreport#4110

Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Kind/cleaner cleaner component of sos Reviewed/Ready for Merge Has been reviewed, ready for merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[cleaner] Regression in hostname cleanup

3 participants