Integrate gitlab-ci/SW-1555_fix_on_422_error_code and 1 more
requested to merge integrate/gitlab-ci/SW-1555_fix_on_422_error_code/into/seco_2017.09 into seco_2017.09
[TOKEN] Insert separated token to fetch LAVA test cases
- Use a dedicated token with higher restrictions to be used when triggering LAVA tests
- Jira bug reference: SW-2172
--
[FIX] Bug fix on MRs failing to be merged for 422
- Sometimes the error ‘422: Branch cannot be merged’ has been noted in cases where the automation fails to rebase (despite no conflicts) and then automatically merge an MR.
- This commit circumvents the problem by trying to rebase when such an error occurs and then trying again to merge.
- Jira bug reference: SW-1555