diff --git a/.scannerwork/report-task.txt b/.scannerwork/report-task.txt index 5e636f7..528f196 100644 --- a/.scannerwork/report-task.txt +++ b/.scannerwork/report-task.txt @@ -2,5 +2,5 @@ projectKey=automatic_cd serverUrl=https://sonarqube.confdroid.com serverVersion=25.5.0.107428 dashboardUrl=https://sonarqube.confdroid.com/dashboard?id=automatic_cd -ceTaskId=05388a82-2830-4ae0-ac24-2f93e32b35aa -ceTaskUrl=https://sonarqube.confdroid.com/api/ce/task?id=05388a82-2830-4ae0-ac24-2f93e32b35aa +ceTaskId=32a467a0-6b69-44e2-ad8b-26a38d29383a +ceTaskUrl=https://sonarqube.confdroid.com/api/ce/task?id=32a467a0-6b69-44e2-ad8b-26a38d29383a diff --git a/Jenkinsfile b/Jenkinsfile index e2752f6..248d03f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -91,7 +91,12 @@ pipeline { 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 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 ''' } }