Integrate meta-seconorth-dual-espresso/update-gitlab-ci
Integrate gitlab-ci/update-dual-espresso-path and 1 more
--
Commit: seco-ne/yocto/infrastructure/gitlab-ci@e6980d48
Update meta-seconorth-dual-espresso path
--
Commit: seco-ne/yocto/infrastructure/gitlab-ci@83002e07
accept_merge_request: explicitly check if MR has merge conflicts
According to the documentation 1 we should get a 406 error from the API if we try to merge a merge request which has a merge conflict. We are experiencing a different behaviour, though, where we are getting a 405 error in this case. There is an open GitLab issue on this topic 2.
In our error handling we assumed that the reason for a 405 error is most likely a required pipeline which is still running. This assumtion, however, leads to wrong behaviour in cases where no pipeline is started at all.
Fixing this now by explicitly checking for merge conflicts at the very beginning of the error handling sequence.
--
Integrate gitlab-ci/document-skip-build-label
--
Commit: seco-ne/yocto/infrastructure/gitlab-ci@0885629d
Document "skip build" label
--
Integrate gitlab-ci/skip-check-via-label and 1 more
--
Commit: seco-ne/yocto/infrastructure/gitlab-ci@5e514076
Add possibility to skip MR pipeline check via label
--
Commit: seco-ne/yocto/infrastructure/gitlab-ci@ee151673
Add possibility to skip MR pipeline build via label
--
Integrate gitlab-ci/allow-check-job-to-fail and 1 more
--
Commit: seco-ne/yocto/infrastructure/gitlab-ci@ad9d367e
Allow check job to fail
This makes merging a project MR possible even if the manifest has received new commits since the MR pipeline build has run. The developer is responsible for deciding whether it is safe to merge it without having a build based on the latest manifest.
BCS 746-000794
--
Commit: seco-ne/yocto/infrastructure/gitlab-ci@81c2ad85
merge_into_manifest: fix error message if MR already exists