confdroid/confdroid_puppet
3
0
Fork 0
Code Issues Packages Wiki Activity

Recommit for updates in build 5

Browse Source
This commit is contained in:
Jenkins Server
2026-02-02 21:53:34 +01:00
parent 6e6dd9a17c
commit 0da187a826
5 changed files with 27 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
.vscode/settings.json vendored
View File

@@ -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"
]
}

127
Jenkinsfile vendored
View File

@@ -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
'''
}
}
}
}
}
}

2
doc/file.README.html
View File

@@ -153,6 +153,8 @@
<h4 id="label-Puppetdb">Puppetdb</h4>
<ul><li>
<p>installs and configures Puppetdb on the node specified with <code>pt_puppetdb_fqdn</code>, which can be the puppetmaster or any other node (recommended for performance reasons)</p>
</li><li>
<p>the logrotation can be set in max days via <code>pt_pptdb_log_max_age</code></p>
</li></ul>
<h2 id="label-Support">Support</h2>

2
doc/index.html
View File

@@ -153,6 +153,8 @@
<h4 id="label-Puppetdb">Puppetdb</h4>
<ul><li>
<p>installs and configures Puppetdb on the node specified with <code>pt_puppetdb_fqdn</code>, which can be the puppetmaster or any other node (recommended for performance reasons)</p>
</li><li>
<p>the logrotation can be set in max days via <code>pt_pptdb_log_max_age</code></p>
</li></ul>
<h2 id="label-Support">Support</h2>

26
doc/puppet_classes/confdroid_puppet_3A_3Aparams.html
View File

@@ -1172,6 +1172,24 @@
&mdash;
<div class='inline'>
<p>placeholder for the server.crt</p>
</div>
</li>
<li>
<span class='name'>pt_pptdb_log_max_age</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;30&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>the max age for puppetdb logs in days</p>
</div>
</li>
@@ -1187,7 +1205,6 @@
<pre class="lines">
68
69
70
71
@@ -1339,10 +1356,12 @@
217
218
219
220</pre>
220
221
222</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 68</span>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 69</span>
class confdroid_puppet::params (
@@ -1400,6 +1419,7 @@ class confdroid_puppet::params (
String $pt_pptdb_ca_crt = &#39;Changeme&#39;,
String $pt_pptdb_server_crt = &#39;Changeme&#39;,
String $pt_pptdb_server_key = &#39;Changeme&#39;,
String $pt_pptdb_log_max_age = &#39;30&#39;,
## jetty
String $pt_http_port = &#39;8080&#39;,