QA (public) » openQA Project (public)

Observation¶

We got an email report about too many failed minion jobs:
https://openqa.opensuse.org/minion/jobs?state=failed

One failed job: https://openqa.opensuse.org/minion/jobs?id=5038421 showing

created: 2025-03-20T14:38:07.148564Z
...
result:
  error: |-
    <strong>Failed to save ibus_test_kr-ibus-korean-switch-hangul-20250319.</strong><br><pre>Unable to push Git commit (/var/lib/openqa/share/tests/opensuse/products/opensuse/needles): To github.com:os-autoinst/os-autoinst-needles-opensuse.git
     ! [rejected]            master -> master (fetch first)
    error: failed to push some refs to 'github.com:os-autoinst/os-autoinst-needles-opensuse.git'
    hint: Updates were rejected because the remote contains work that you do not
    hint: have locally. This is usually caused by another repository pushing to
    hint: the same ref. If you want to integrate the remote changes, use
    hint: 'git pull' before pushing again.
    hint: See the 'Note about fast-forwards' in 'git push --help' for details.</pre>

There were 5 failed jobs like this around the same time: https://openqa.opensuse.org/minion/jobs?task=save_needle&state=failed&queue=¬e=

At some point the user was able to save the needle.

The problem is that update_remote and update_branch are not enabled on o3, so it can happen that a push to the needles repo happened while someone else is trying to save a new needle.
Only when those two configuration options are enabled the code will try to rebase on the upstream master.
But another problem is that update_branch needs a branch name, and that might not be the same for all repos (e.g. it's main for os-autoinst-distri-example).

Acceptance Criteria¶

• AC1: The user of the openQA webUI needle editor is less likely to see an error about failed git push, e.g. on two users conflicting
• AC2: In the general case of unrecovered git errors the error detail is still shown to users

Suggestions¶

• Make save_needle use the same approach as git_clone to find out the upstream default branch (instead of having to configure update_branch)
• Consider to still keep the config option to be able to override
• Also check delete_needles if it would need a similar change
• Code: https://github.com/os-autoinst/openQA/blob/master/etc/openqa/openqa.ini#L108-L111 & https://github.com/os-autoinst/openQA/blob/master/lib/OpenQA/Git.pm#L68
• https://github.com/os-autoinst/openQA/blob/master/lib/OpenQA/Git.pm#L145 We do already have get_remote_default_branch() which we can use here
• https://app.codecov.io/gh/os-autoinst/openQA/blob/master/lib%2FOpenQA%2FGit.pm is already 100% covered so not that much risk there :) So is https://app.codecov.io/gh/os-autoinst/openQA/tree/master/lib%2FOpenQA%2FTask%2FGit
• https://github.com/os-autoinst/openQA/blob/master/t/16-utils-runcmd.t or maybe https://github.com/os-autoinst/openQA/blob/master/t/14-grutasks-git.t#L376