From 0da187a826be63969993e11027390be2af0d9e19 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Mon, 2 Feb 2026 21:53:34 +0100 Subject: [PATCH] Recommit for updates in build 5 --- .vscode/settings.json | 40 ------ Jenkinsfile | 127 ------------------ doc/file.README.html | 2 + doc/index.html | 2 + .../confdroid_puppet_3A_3Aparams.html | 26 +++- 5 files changed, 27 insertions(+), 170 deletions(-) delete mode 100644 .vscode/settings.json delete mode 100644 Jenkinsfile diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 344101d..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "cSpell.words": [ - "appender", - "asctime", - "basedirt", - "cachedir", - "Changeme", - "devel", - "fastapi", - "getenv", - "Gitea", - "hashlib", - "hmac", - "httpx", - "isoformat", - "kahadb", - "levelname", - "logappender", - "NOFILE", - "operatingsystemrelease", - "pptd", - "pptdb", - "Puppetfile", - "pydantic", - "pylint", - "pytest", - "refreshonly", - "repolist", - "requestlogging", - "rubygems", - "springframework", - "startswith", - "Supress", - "sysconfig", - "trapperkeeper", - "utcnow", - "uvicorn", - "webrick" - ] -} \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 1c35973..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,127 +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 { - 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://gitea.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/file.README.html b/doc/file.README.html index 7021433..dc27550 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -153,6 +153,8 @@

Puppetdb

Support

diff --git a/doc/index.html b/doc/index.html index 61cee29..fc57025 100644 --- a/doc/index.html +++ b/doc/index.html @@ -153,6 +153,8 @@

Puppetdb

Support

diff --git a/doc/puppet_classes/confdroid_puppet_3A_3Aparams.html b/doc/puppet_classes/confdroid_puppet_3A_3Aparams.html index cdfaeae..006355c 100644 --- a/doc/puppet_classes/confdroid_puppet_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_puppet_3A_3Aparams.html @@ -1172,6 +1172,24 @@ —

placeholder for the server.crt

+
+ + + +
  • + + pt_pptdb_log_max_age + + + (String) + + + (defaults to: '30') + + + — +
    +

    the max age for puppetdb logs in days

    • @@ -1187,7 +1205,6 @@ 
     
 
-68
 69
 70
 71
@@ -1339,10 +1356,12 @@
 217
 218
 219
-220
    +220 +221 +222 - 
    # File 'manifests/params.pp', line 68
+        
    # File 'manifests/params.pp', line 69
 
 class confdroid_puppet::params (
 
@@ -1400,6 +1419,7 @@ class confdroid_puppet::params (
   String $pt_pptdb_ca_crt           = 'Changeme',
   String $pt_pptdb_server_crt       = 'Changeme',
   String $pt_pptdb_server_key       = 'Changeme',
+  String $pt_pptdb_log_max_age      = '30',
 
   ## jetty
   String $pt_http_port              = '8080',