Integrate gitlab-ci/lpag/fix_integration_branch_name and 2 more
requested to merge integrate/gitlab-ci/lpag/fix_integration_branch_name/into/kirkstone_next_2_0 into kirkstone_next_2_0
Commit: edgehog/infrastructure/gitlab-ci@139ddf9b
[FIX][INTEGRATION] Bug fix in merging integration MR
- The integration branch name when a new MR is created actually contains the repository name, while the script that is performing the merging of the branch was using the recipe name. Aligning the behaviour of the two scripts.
- Handle GitLab exception when no MR pipeline is created.
- Insert Mediatek handling in pipeline retriggering function.
--
Commit: edgehog/infrastructure/gitlab-ci@5682aa05
[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
--
Commit: edgehog/infrastructure/gitlab-ci@c5154a56
[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