From 8b3cb3c216857842fbac7e58ed94d37f70bea5de Mon Sep 17 00:00:00 2001
From: Arne Teuke <arne_teuke@confdroid.com>
Date: Thu, 22 May 2025 17:46:10 +0200
Subject: [PATCH] fix build info and Jenkins pipeline

---
 Jenkinsfile | 47 +++++++++++++++++++++++++++++------------------
 README.md   |  6 +++---
 2 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 5ff6855..e6634d8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -25,10 +25,16 @@ pipeline {
       stage('pull master') {
         steps {
           sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
-            sh '''git config user.name "Jenkins Server"
-                  git config user.email jenkins@confdroid.com
-                  git pull origin master
-                  git checkout -b jenkins '''
+            sh '''
+                git config user.name "Jenkins Server"
+                git config user.email jenkins@confdroid.com
+                # 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 {
           sh '''/usr/local/bin/puppet-lint . \\
                 --no-variable_scope-check \\
+                || { echo "Puppet lint failed"; exit 1; }
             '''
           }
         }
 
-     stage('SonarScan') {
+      stage('SonarScan') {
          steps {
-             sh '''
-             /opt/sonar-scanner/bin/sonar-scanner \
-              -Dsonar.projectKey=fail2ban_cd \
-              -Dsonar.sources=. \
-              -Dsonar.host.url=https://sonarqube.confdroid.com \
-              -Dsonar.token=sqa_aca21cc41336d0f31987ed196ccfb9be55ded774
-              '''
-             }
+            withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_TOKEN')]) {
+              sh '''
+              /opt/sonar-scanner/bin/sonar-scanner \
+                -Dsonar.projectKey=fail2ban_cd \
+                -Dsonar.sources=. \
+                -Dsonar.host.url=https://sonarqube.confdroid.com \
+                -Dsonar.token=$SONAR_TOKEN
+                '''
+              }
+            }
           }
 
       stage('create Puppet documentation') {
@@ -78,12 +87,14 @@ pipeline {
       stage('update repo') {
         steps {
           sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
-            sh '''git config user.name "Jenkins Server"
-                  git config user.email jenkins@confdroid.com
-                  echo `git add -A && git commit -am "recommit for updates in build $BUILD_NUMBER"`
-                  git push origin HEAD:master'''
+            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
+            '''
         }
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index 39f8f52..7fdc25a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Readme
 
-[![Build Status](https://pipelines.confdroid.com/buildStatus/icon?job=fail2ban_cd)](https://pipelines.confdroid.com/job/fail2ban_cd/)
+[![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=fail2ban_cd)](https://jenkins.confdroid.com/job/fail2ban_cd/)
 
 [[_TOC_]]
 
@@ -33,8 +33,8 @@ Service
 
 All dependencies must be included in the catalogue.
 
-* [cd_resources](https://sourcecode.confdroid.com/12WW1160/cd_resources) to manage yum base repos
-* [cd_firewall](https://sourcecode.confdroid.com/12WW1160/cd_firewall) or puppetlabs-firewall to manage firewall settings (optional)
+* [cd_resources](https://gitlab.confdroid.com/puppet/cd_resources) to manage yum base repos
+* [cd_firewall](https://gitlab.confdroid.com/puppet/cd_firewall) or puppetlabs-firewall to manage firewall settings (optional)
 
 ## Deployment