From 74f77d10bb4b8c65cf12b3df75204a15f67fc7b8 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Tue, 8 Sep 2026 13:37:40 +0200 Subject: [PATCH] Recommit for updates in build 66 --- Jenkinsfile | 126 ------------------ ...e_3A_3Acommands_3A_3Adefinition_rules.html | 12 +- 2 files changed, 11 insertions(+), 127 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index f92fb5f..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,126 +0,0 @@ -pipeline { - agent any - - post { - always { - deleteDir() /* clean up our workspace */ - } - success { - updateGitlabCommitStatus state: 'success' - } - failure { - updateGitlabCommitStatus state: 'failed' - step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: 'support@confdroid.com', sendToIndividuals: true]) - } - } - - options { - gitLabConnection('gitlab.confdroid.com') - } - - stages { - - stage('pull master') { - steps { - sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) { - 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; } - ''' - } - } - } - - stage('puppet parser') { - steps { - sh '''for file in $(find . -iname \'*.pp\'); do - /opt/puppetlabs/bin/puppet parser validate --color false --render-as s --modulepath=modules $file || exit 1; - done;''' - } - } - - stage('check templates') { - steps{ - sh '''for file in $(find . -iname \'*.erb\'); - do erb -P -x -T "-" $file | ruby -c || exit 1; - done;''' - } - } - - stage('puppet-lint') { - steps { - sh '''/usr/local/bin/puppet-lint . \\ - --no-variable_scope-check \\ - || { echo "Puppet lint failed"; exit 1; } - ''' - } - } - - stage('SonarScan') { - steps { - withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_TOKEN')]) { - sh ''' - /opt/sonar-scanner/bin/sonar-scanner \ - -Dsonar.projectKey=confdroid_nrpe \ - -Dsonar.sources=. \ - -Dsonar.host.url=https://sonarqube.confdroid.com \ - -Dsonar.token=$SONAR_TOKEN - ''' - } - } - } - - stage('create Puppet documentation') { - steps { - sh '/opt/puppetlabs/bin/puppet strings' - } - } - - stage('update repo') { - steps { - sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) { - sh ''' - git config user.name "Jenkins Server" - git config user.email jenkins@confdroid.com - git rm -r --cached .vscode || echo "No .vscode to remove from git" - git add -A && git commit -am "Recommit for updates in build $BUILD_NUMBER" || echo "No changes to commit" - git push origin HEAD:master - ''' - } - } - } - - stage('Mirror to Gitea') { - steps { - sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) { - withCredentials([usernamePassword( - credentialsId: 'Jenkins-gitea', - usernameVariable: 'GITEA_USER', - passwordVariable: 'GITEA_TOKEN')]) { - script { - // Checkout from GitLab (already done implicitly) - sh ''' - git checkout master - git pull origin master - git branch -D development - git branch -D jenkins-build-$BUILD_NUMBER - git rm -f Jenkinsfile - git rm -r --cached .vscode || echo "No .vscode to remove from git" - git commit --amend --no-edit --allow-empty - git remote add master https://sourcecode.confdroid.com/confdroid/confdroid_nrpe.git - git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \ - push master --mirror - ''' - } - } - } - } - } - } -} \ No newline at end of file diff --git a/doc/puppet_classes/confdroid_nrpe_3A_3Acommands_3A_3Adefinition_rules.html b/doc/puppet_classes/confdroid_nrpe_3A_3Acommands_3A_3Adefinition_rules.html index 13b8d1b..1111510 100644 --- a/doc/puppet_classes/confdroid_nrpe_3A_3Acommands_3A_3Adefinition_rules.html +++ b/doc/puppet_classes/confdroid_nrpe_3A_3Acommands_3A_3Adefinition_rules.html @@ -201,7 +201,12 @@ 97 98 99 -100 +100 +101 +102 +103 +104 +105
# File 'manifests/commands/definition_rules.pp', line 12
@@ -293,6 +298,11 @@ class confdroid_nrpe::commands::definition_rules (
       ne_check_cmd     => 'check_procs',
       ne_cmd_argstring => '-c $ARG1$ -a $ARG2$',
     }
+    confdroid_nrpe::commands::definitions { 'check_puppetdb':
+      ne_check_name    => 'check_puppetdb',
+      ne_check_cmd     => 'check_procs',
+      ne_cmd_argstring => '-c $ARG1$ -a $ARG2$',
+    }
   }
 }