[tools][needles]needles pushing can interfer with "fetchneedles"
I just realized today after creating a needle over the webui of osd that "fetchneedles-sles" returned an error with
You are not currently on a branch. Please specify which branch you want to rebase against. See git-rebase(1) for details. git rebase <branch>
Checking after that I found out that
is on "(no branch)" and needs to be manually merged again.
Updated by okurz about 6 years ago
- Subject changed from needles pushing can interfer with "fetchneedles" to [tools][needles]needles pushing can interfer with "fetchneedles"
On osd we also have a workaround for another problem which should be taken into account although that does not seem to cause the problem
# sometimes gitlab.s.d is unresponsive and there are new needles coming in and we did not pull in time before someone created new needles from the webui so make sure this is synced at least once a day 47 3 * * * geekotest (cd /var/lib/openqa/share/tests/sle && git pull --rebase >/dev/null && git push origin HEAD:master >/dev/null 2>&1)
I wonder what is exactly happening here. I assume git already has a locking mechanism which should prevent this but maybe it's not. I guess we should adapt fetchneedles to check better the pre- and post-state, some sanity checks, you know.