confdroid/confdroid_ntp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Recommit for updates in build 5

Browse Source
This commit is contained in:
Jenkins Server
2026-10-02 12:58:40 +02:00
parent 0cc578c16c
commit 7f5f087922
4 changed files with 58 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

30
doc/puppet_classes/confdroid_ntp_3A_3Amain_3A_3Afiles.html
View File

@@ -109,7 +109,21 @@
11
12
13
14</pre>
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
@@ -120,6 +134,20 @@ class confdroid_ntp::main::files (
require confdroid_ntp::main::dirs
# main configuration file
file { $cy_conf_file:
ensure =&gt; file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
content =&gt; template($cy_conf_erb),
notify =&gt; Service[$cy_service],
}
# drift file /var/lib/chrony/drift
# log rotation
}</pre>

2
doc/puppet_classes/confdroid_ntp_3A_3Amain_3A_3Aservice.html
View File

@@ -122,7 +122,7 @@ class confdroid_ntp::main::service (
) inherits confdroid_ntp::params {
require confdroid_ntp::main::files
service { $cy_service_name:
service { $cy_service:
ensure =&gt; running,
hasstatus =&gt; true,
hasrestart =&gt; true,

33
doc/puppet_classes/confdroid_ntp_3A_3Aparams.html
View File

@@ -144,6 +144,19 @@
</li>
<li>
<span class='name'>cy_conf_servers</span>
<span class='type'>(<tt>Array</tt>)</span>
<em class="default">(defaults to: <tt>[&#39;0.pool.ntp.org&#39;, &#39;1.pool.ntp.org&#39;, &#39;2.pool.ntp.org&#39;, &#39;3.pool.ntp.org&#39;]</tt>)</em>
</li>
</ul>
@@ -174,7 +187,12 @@
25
26
27
28</pre>
28
29
30
31
32
33</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 9</span>
@@ -182,19 +200,24 @@
class confdroid_ntp::params (
# installation
Array $cy_reqpackages = [&#39;chrony&#39;],
String $cy_pkg_ensure = &#39;present&#39;,
Array $cy_reqpackages = [&#39;chrony&#39;],
String $cy_pkg_ensure = &#39;present&#39;,
# configuration
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;],
) {
# defaults
$fqdn = $facts[&#39;networking&#39;][&#39;fqdn&#39;]
$fqdn = $facts[&#39;networking&#39;][&#39;fqdn&#39;]
# dirs
# files
$cy_conf_file = &#39;/etc/chrony.conf&#39;
$cy_conf_erb = &#39;confdroid_ntp/chrony.conf.erb&#39;
# service
$cy_service_name = &#39;chronyd&#39;
$cy_service = &#39;chronyd&#39;
# includes must be last
include confdroid_ntp::main::config