3
0

OP#188 update Jenksinfile for correct flow

This commit is contained in:
2025-12-03 15:41:19 +01:00
parent eca339f345
commit b760db13d8

9
Jenkinsfile vendored
View File

@@ -88,15 +88,10 @@ pipeline {
steps { steps {
sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) { sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
sh ''' sh '''
git config user.name "Jenkins Server" git config user.name "Jenkins Server"
git config user.email jenkins@confdroid.com 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 add -A && git commit -am "Recommit for updates in build $BUILD_NUMBER" || echo "No changes to commit"
git push -o merge_request.create \ git push origin HEAD:master
-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
''' '''
} }
} }