Skip to content

Revert recent changes regarding osc invocations#520

Merged
mergify[bot] merged 4 commits intoos-autoinst:masterfrom
Martchus:revert-osc-retry
Feb 10, 2026
Merged

Revert recent changes regarding osc invocations#520
mergify[bot] merged 4 commits intoos-autoinst:masterfrom
Martchus:revert-osc-retry

Conversation

@Martchus
Copy link
Contributor

@Martchus Martchus commented Feb 6, 2026

With the latest fix there are no broken characters anymore but I saw this PR which has many deleted changelog lines: https://src.opensuse.org/pool/os-autoinst/pulls/14#issuecomment-88805

Note sure whether that's still due to the recent changes. In case it turns out to be the case I've prepared this PR so we can go back to the previous state.

Related ticket: https://progress.opensuse.org/issues/195695

@perlpunk
Copy link
Contributor

perlpunk commented Feb 6, 2026

Yeah, I guess to regex is probably too permissive :(
http://jenkins.qe.nue2.suse.org/job/submit-openQA-TW-to-oS_Fctry/8576/consoleFull

[debug] ### osc cat openSUSE:Factory/os-autoinst/os-autoinst.changes
[warn] ' retry -e -- osc cat openSUSE:Factory/os-autoinst/os-autoinst.changes' output seems to contain HTTP header.
[warn] Trying 2 more times after 3 seconds …
[warn] ' retry -e -- osc cat openSUSE:Factory/os-autoinst/os-autoinst.changes' output seems to contain HTTP header.
[warn] Trying 1 more times after 6 seconds …
[warn] ' retry -e -- osc cat openSUSE:Factory/os-autoinst/os-autoinst.changes' output seems to contain HTTP header.
[warn] Full output: -------------------------------------------------------------------
Wed Jan 28 12:34:32 UTC 2026 - okurz@suse.com

- Update to version 5.1769602729.9728790:

@Martchus
Copy link
Contributor Author

Martchus commented Feb 6, 2026

Yes, the regex is too generic.

@mergify
Copy link
Contributor

mergify bot commented Feb 6, 2026

This pull request is now in conflicts. Could you fix it? 🙏

@Martchus Martchus marked this pull request as ready for review February 10, 2026 10:23
@Martchus
Copy link
Contributor Author

Martchus commented Feb 10, 2026

Maybe we should revert previous changes via this PR considering the deleted changelog lines in https://build.opensuse.org/package/rdiff/devel:openQA:tested/openQA.

Note that the build of os-autoinst still fails due to invalid characters but it hasn't been updated by the submission script. So @perlpunk's revision 350 is still the most recent on https://build.opensuse.org/package/revisions/devel:openQA:tested/os-autoinst and it just didn't remove all control characters. So I removed the remaining control characters I could find.

@Martchus
Copy link
Contributor Author

Although I'm also not completely confident whether reverting this now will actually help with the log deletions in the openQA package. Maybe we'll have to restore some piece of information elsewhere which is our actual problem.

@mergify mergify bot merged commit fb0290b into os-autoinst:master Feb 10, 2026
8 checks passed
@Martchus Martchus deleted the revert-osc-retry branch February 10, 2026 12:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants