Undo !1697 which was creating problems in CI

Description of bug

In !1697 (merged) the cleanup job was decoupled from the main pipeline and run only on MRs. This broke the dependency on the previous job and as a result logs would be removed even if the original pipeline would fail (see e.g. !1707 (closed))

Changes introduced

Just undo what was done in !1697 (merged)

Tests

Issues resolved

Closes #