From: Don Zickus on
gitlab.com
Merge Request:
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2969
The nightly rt merging cronjob immediately failed the second night because I
forgot to push the intermediary branch rt-automated-devel. So when it got
rebuilt the next night from scratch it got merged into rt-devel and
automotive-devel in a way that required those branches to be forced pushed.
Not good for development.
The easy way is to push that branch but that requires re-pushing rt-devel and
automotive-devel. Not hard. Instead I wanted to remove that intermediary
branch leaving less complicated logic and rely on an octopus merge. Should
work better now and simpler to read.
Signed-off-by: Don Zickus dzickus(a)redhat.com
---
redhat/scripts/ci/ark-ci-env.sh | 24 +++++++----
redhat/scripts/ci/ark-merge-rt.sh | 81 ++++++++++++++++----------------------
2 files changed, 50 insertions(+), 55 deletions(-)