confdroid/puppet_cd
3
0
Fork 0
Code Wiki Activity

fix build info and Jenkins pipeline

Browse Source
This commit is contained in:
Arne Teuke
2025-05-22 18:52:58 +02:00
parent af0271c446
commit 8d1bdee469
2 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Jenkinsfile vendored
View File

@@ -25,10 +25,16 @@ pipeline {
stage('pull master') { stage('pull master') {
steps { steps {
sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) { sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
sh '''git config user.name "Jenkins Server" sh '''
git config user.email jenkins@confdroid.com git config user.name "Jenkins Server"
git pull origin master git config user.email jenkins@confdroid.com
git checkout -b jenkins ''' # Ensure we're on the development branch (triggered by push)
git checkout development
# Create jenkins branch from development
git checkout -b jenkins-build-$BUILD_NUMBER
# Optionally merge master into jenkins to ensure compatibility
git merge origin/master --no-ff || { echo "Merge conflict detected"; exit 1; }
'''
} }
} }
} }
@@ -53,20 +59,23 @@ pipeline {
steps { steps {
sh '''/usr/local/bin/puppet-lint . \\ sh '''/usr/local/bin/puppet-lint . \\
--no-variable_scope-check \\ --no-variable_scope-check \\
|| { echo "Puppet lint failed"; exit 1; }
''' '''
} }
} }
stage('SonarScan') { stage('SonarScan') {
steps { steps {
sh ''' withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_TOKEN')]) {
/opt/sonar-scanner/bin/sonar-scanner \ sh '''
-Dsonar.projectKey=puppet_cd \ /opt/sonar-scanner/bin/sonar-scanner \
-Dsonar.sources=. \ -Dsonar.projectKey=puppet_cd \
-Dsonar.host.url=https://sonarqube.confdroid.com \ -Dsonar.sources=. \
-Dsonar.token=sqa_aca21cc41336d0f31987ed196ccfb9be55ded774 -Dsonar.host.url=https://sonarqube.confdroid.com \
''' -Dsonar.token=$SONAR_TOKEN
} '''
}
}
} }
stage('create Puppet documentation') { stage('create Puppet documentation') {
@@ -78,12 +87,14 @@ pipeline {
stage('update repo') { stage('update repo') {
steps { steps {
sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) { sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
sh '''git config user.name "Jenkins Server" sh '''
git config user.email jenkins@confdroid.com git config user.name "Jenkins Server"
echo `git add -A && git commit -am "recommit for updates in build $BUILD_NUMBER"` git config user.email jenkins@confdroid.com
git push origin HEAD:master''' git add -A && git commit -am "Recommit for updates in build $BUILD_NUMBER" || echo "No changes to commit"
git push origin HEAD:master
'''
} }
} }
} }
} }
} }

2
README.md
View File

@@ -1,6 +1,6 @@
# Readme # Readme
[![Build Status](https://pipelines.confdroid.com/buildStatus/icon?job=puppet_cd)](https://pipelines.confdroid.com/job/puppet_cd/)| [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=puppet_cd)](https://jenkins.confdroid.com/job/puppet_cd/)|
[[_TOC_]] [[_TOC_]]