Compare commits

...

3 Commits

Author SHA1 Message Date
Jenkins Server
6fd17943b5 Merge remote-tracking branch 'origin/master' into jenkins-build-34 2026-03-14 12:27:57 +01:00
079b11b876 update Readme 2026-03-14 12:26:50 +01:00
Jenkins Server
0bb6a9b44d Recommit for updates in build 33 2026-03-14 12:25:22 +01:00
4 changed files with 13 additions and 129 deletions

2
.gitignore vendored
View File

@@ -3,3 +3,5 @@ Gemfile.lock
FileList FileList
.scannerwork .scannerwork
.vscode .vscode
.puppet-lint.rc
.rspec

124
Jenkinsfile vendored
View File

@@ -1,124 +0,0 @@
pipeline {
agent any
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_gitea \
-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://sourcecode.confdroid.com/confdroid/confdroid_gitea.git
git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \
push master --mirror
'''
}
}
}
}
}
}

View File

@@ -60,7 +60,7 @@
<div id="content"><div id='filecontents'> <div id="content"><div id='filecontents'>
<h1 id="label-README">README</h1> <h1 id="label-README">README</h1>
<p><a href="https://jenkins.confdroid.com/job/confdroid_gitea/"><img src="https://jenkins.confdroid.com/job/confdroid_gitea/badge/icon?style=plastic"></a> <a href="https://sonarqube.confdroid.com/dashboard?id=confdroid_gitea"><img src="https://sonarqube.confdroid.com/api/project_badges/measure?project=confdroid_gitea&amp;metric=security_hotspots&amp;token=sqb_e16eae418a0f6a314da3d3497d65dc72f7c429ec"></a></p> <p><a href="https://jenkins.confdroid.com/job/confdroid_gitea/"><img src="https://jenkins.confdroid.com/job/confdroid_gitea/badge/icon?style=plastic"></a> <a href="https://sonarqube.confdroid.com/dashboard?id=confdroid_gitea"><img src="https://sonarqube.confdroid.com/api/project_badges/measure?project=confdroid_gitea&amp;metric=security_hotspots&amp;token=sqb_e16eae418a0f6a314da3d3497d65dc72f7c429ec"></a> <a href="https://deepwiki.com/grizzlycoda/puppet_collection"><img src="https://deepwiki.com/badge.svg"></a></p>
<ul><li> <ul><li>
<p><a href="#readme">README</a></p> <p><a href="#readme">README</a></p>
</li><li> </li><li>
@@ -102,7 +102,10 @@
<p>You must set <code>ga_host_fqdn</code> and specify the correct hostname, else nothing will be configured to avoid having accidentally multiple hosts configured as gitea server.</p> <p>You must set <code>ga_host_fqdn</code> and specify the correct hostname, else nothing will be configured to avoid having accidentally multiple hosts configured as gitea server.</p>
<p>Installation - install required binaries.</p> <p>Installation</p>
<ul><li>
<p>install required binaries.</p>
</li></ul>
<p>Configuration</p> <p>Configuration</p>
<ul><li> <ul><li>

View File

@@ -60,7 +60,7 @@
<div id="content"><div id='filecontents'> <div id="content"><div id='filecontents'>
<h1 id="label-README">README</h1> <h1 id="label-README">README</h1>
<p><a href="https://jenkins.confdroid.com/job/confdroid_gitea/"><img src="https://jenkins.confdroid.com/job/confdroid_gitea/badge/icon?style=plastic"></a> <a href="https://sonarqube.confdroid.com/dashboard?id=confdroid_gitea"><img src="https://sonarqube.confdroid.com/api/project_badges/measure?project=confdroid_gitea&amp;metric=security_hotspots&amp;token=sqb_e16eae418a0f6a314da3d3497d65dc72f7c429ec"></a></p> <p><a href="https://jenkins.confdroid.com/job/confdroid_gitea/"><img src="https://jenkins.confdroid.com/job/confdroid_gitea/badge/icon?style=plastic"></a> <a href="https://sonarqube.confdroid.com/dashboard?id=confdroid_gitea"><img src="https://sonarqube.confdroid.com/api/project_badges/measure?project=confdroid_gitea&amp;metric=security_hotspots&amp;token=sqb_e16eae418a0f6a314da3d3497d65dc72f7c429ec"></a> <a href="https://deepwiki.com/grizzlycoda/puppet_collection"><img src="https://deepwiki.com/badge.svg"></a></p>
<ul><li> <ul><li>
<p><a href="#readme">README</a></p> <p><a href="#readme">README</a></p>
</li><li> </li><li>
@@ -102,7 +102,10 @@
<p>You must set <code>ga_host_fqdn</code> and specify the correct hostname, else nothing will be configured to avoid having accidentally multiple hosts configured as gitea server.</p> <p>You must set <code>ga_host_fqdn</code> and specify the correct hostname, else nothing will be configured to avoid having accidentally multiple hosts configured as gitea server.</p>
<p>Installation - install required binaries.</p> <p>Installation</p>
<ul><li>
<p>install required binaries.</p>
</li></ul>
<p>Configuration</p> <p>Configuration</p>
<ul><li> <ul><li>