Recommit for updates in build 22

This commit is contained in:
Jenkins Server
2026-10-02 15:49:43 +02:00
parent cd29151c6b
commit ea7e79203b
4 changed files with 130 additions and 141 deletions

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_ntp \
-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_ntp.git
git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \
push master --mirror
'''
}
}
}
}
}
}
}

View File

@@ -103,6 +103,12 @@
<h2 id="label-Features">Features</h2>
<p>This module differentiates between client- and server configuration. If the <code>FQDN</code> of the puppet client matches the value of <code>cy_server_fqdn</code>, it assumes this to be an ntp time server, else it will be a client.</p>
<p>If you have no local time server(s), leave the default for <code>cy_server_fqdn</code>.</p>
<p>The value for <code>cy_server_fqdn</code> is a string rather array, assuming either a single time server or a round-robin DNS entry for this, returning several values for the time server (not configured by this module).</p>
<p>INSTALLATION</p>
<ul><li>
<p>installs chrony binaries</p>
@@ -110,7 +116,9 @@
<p>CONFIGURATION</p>
<ul><li>
<p>manage directories and files including templates</p>
<p>manage directories including selinux contexts</p>
</li><li>
<p>and files and their templates including selinux contexts</p>
</li><li>
<p>manage service</p>
</li><li>

View File

@@ -103,6 +103,12 @@
<h2 id="label-Features">Features</h2>
<p>This module differentiates between client- and server configuration. If the <code>FQDN</code> of the puppet client matches the value of <code>cy_server_fqdn</code>, it assumes this to be an ntp time server, else it will be a client.</p>
<p>If you have no local time server(s), leave the default for <code>cy_server_fqdn</code>.</p>
<p>The value for <code>cy_server_fqdn</code> is a string rather array, assuming either a single time server or a round-robin DNS entry for this, returning several values for the time server (not configured by this module).</p>
<p>INSTALLATION</p>
<ul><li>
<p>installs chrony binaries</p>
@@ -110,7 +116,9 @@
<p>CONFIGURATION</p>
<ul><li>
<p>manage directories and files including templates</p>
<p>manage directories including selinux contexts</p>
</li><li>
<p>and files and their templates including selinux contexts</p>
</li><li>
<p>manage service</p>
</li><li>

View File

@@ -152,7 +152,7 @@
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;ntp.example.com&#39;</tt>)</em>
<em class="default">(defaults to: <tt>&#39;ntp.example.local&#39;</tt>)</em>
&mdash;
@@ -176,6 +176,96 @@
&mdash;
<div class='inline'>
<p>List of NTP servers to point to as time source</p>
</div>
</li>
<li>
<span class='name'>cy_min_sources</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;3&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>Minimum number of selectable sources required to adjust the system clock. Primarily used for servers.</p>
</div>
</li>
<li>
<span class='name'>cy_client_allow</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;192.168.1.0/24&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>CIDR notation for allowed client networks</p>
</div>
</li>
<li>
<span class='name'>cy_leapsec_mode</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;slew&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>Leap second handling mode. Valid values are ‘slew’ or ‘step’.</p>
</div>
</li>
<li>
<span class='name'>cy_leapsectz</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;right/UTC&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>Leap second timezone file to use.</p>
</div>
</li>
<li>
<span class='name'>cy_loginfo</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;measurements statistics tracking&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>Log information to record. Valid values are ‘measurements’, ‘statistics’, and ‘tracking’.</p>
</div>
</li>
@@ -191,14 +281,6 @@
<pre class="lines">
13
14
15
16
17
18
19
20
21
22
23
@@ -219,10 +301,23 @@
38
39
40
41</pre>
41
42
43
44
45
46
47
48
49
50
51
52
53
54</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 13</span>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 21</span>
class confdroid_ntp::params (
@@ -231,8 +326,13 @@ class confdroid_ntp::params (
String $cy_pkg_ensure = &#39;present&#39;,
# configuration
String $cy_server_fqdn = &#39;ntp.example.com&#39;,
String $cy_server_fqdn = &#39;ntp.example.local&#39;,
Array $cy_conf_servers = [&#39;0.pool.ntp.org&#39;, &#39;1.pool.ntp.org&#39;, &#39;2.pool.ntp.org&#39;, &#39;3.pool.ntp.org&#39;],
String $cy_min_sources = &#39;3&#39;,
String $cy_client_allow = &#39;192.168.1.0/24&#39;,
String $cy_leapsec_mode = &#39;slew&#39;,
String $cy_leapsectz = &#39;right/UTC&#39;,
String $cy_loginfo = &#39;measurements statistics tracking&#39;,
) {
# facts