From 5f13a79a12bce5992177880fc2542803ad0365fe Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Tue, 21 Oct 2025 17:18:00 +0200 Subject: [PATCH] update jenkinsfile - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/283 --- Jenkinsfile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 819db62..7a37490 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -88,10 +88,15 @@ pipeline { steps { sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) { sh ''' - git config user.name "Jenkins Server" - git config user.email jenkins@confdroid.com - git add -A && git commit -am "Recommit for updates in build $BUILD_NUMBER" || echo "No changes to commit" - git push origin HEAD:master + git config user.name "Jenkins Server" + git config user.email jenkins@confdroid.com + git add -A && git commit -am "Recommit for updates in build $BUILD_NUMBER" || echo "No changes to commit" + git push -o merge_request.create \ + -o merge_request.target=master \ + -o merge_request.title="Auto-merge for build $BUILD_NUMBER" \ + -o merge_request.description="Automated changes from Jenkins build $BUILD_NUMBER" \ + -o merge_request.merge_when_pipeline_succeeds=true \ + origin jenkins-build-$BUILD_NUMBER ''' } }