From 9f7f93bfe14be09b0a5753a8878dba5ba17723f5 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sun, 2 Aug 2026 14:04:09 +0200 Subject: [PATCH] Recommit for updates in build 20 --- Jenkinsfile | 128 ------------------ .../confdroid_puppet_3A_3Amain_3A_3Adirs.html | 26 +++- .../confdroid_puppet_3A_3Aparams.html | 4 +- 3 files changed, 27 insertions(+), 131 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 4538b55..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,128 +0,0 @@ -pipeline { - agent { - label 'puppet' - } - - 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_puppet \ - -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_puppet.git - git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \ - push master --mirror - ''' - } - } - } - } - } - } -} diff --git a/doc/puppet_classes/confdroid_puppet_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/confdroid_puppet_3A_3Amain_3A_3Adirs.html index a89c6a6..0148b07 100644 --- a/doc/puppet_classes/confdroid_puppet_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/confdroid_puppet_3A_3Amain_3A_3Adirs.html @@ -133,7 +133,18 @@ 35 36 37 -38 +38 +39 +40 +41 +42 +43 +44 +45 +46 +47 +48 +49 
# File 'manifests/main/dirs.pp', line 6
@@ -168,7 +179,18 @@ class confdroid_puppet::main::dirs (
   }
 
   if $fqdn == $pt_pm_fqdn {
-    # server dirs here
+    # puppetserver dir
+    file { $pt_server_dir:
+      ensure   => directory,
+      path     => $pt_server_dir,
+      owner    => 'puppet',
+      group    => 'puppet',
+      mode     => '0750',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => puppet_etc_t,
+      seluser  => system_u,
+    }
   }
 }
diff --git a/doc/puppet_classes/confdroid_puppet_3A_3Aparams.html b/doc/puppet_classes/confdroid_puppet_3A_3Aparams.html index 006355c..e6e0d9a 100644 --- a/doc/puppet_classes/confdroid_puppet_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_puppet_3A_3Aparams.html @@ -1358,7 +1358,8 @@ 219 220 221 -222 +222 +223 
# File 'manifests/params.pp', line 69
@@ -1450,6 +1451,7 @@ class confdroid_puppet::params (
   $pt_main_dir                      = '/etc/puppetlabs'
   $pt_puppetdir                     = "${pt_main_dir}/puppet"
   $pt_code_dir                      = "${pt_main_dir}/code"
+  $pt_server_dir                    = "${pt_main_dir}/puppetserver"
   $pt_environmentspath              = "${pt_code_dir}/environments"
   $pt_ssldir                        = "${pt_puppetdir}/ssl"
   $pt_privatekeydir                 = "${pt_ssldir}/private_keys"