confdroid/confdroid_automatic
1
0
Fork 0
Code Issues Projects Wiki Activity

Merge branch 'jenkins-build-12' into 'master'

Browse Source 
Auto-merge for build 12

See merge request puppet/automatic_cd!1
This commit is contained in:
Jenkins
2025-08-18 02:30:25 +00:00
parent 87b0365edf 8c3fe53ee3
commit 1160e843d2
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.scannerwork/report-task.txt
View File

@@ -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

7
Jenkinsfile vendored
View File

@@ -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
'''
}
}