From 2a8939fbcb27074b73ba18a0b2fd26a4a48926a1 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Tue, 21 Jul 2026 13:27:22 +0200 Subject: [PATCH] Recommit for updates in build 1 --- .vscode/settings.json | 12 - Jenkinsfile | 127 ------ doc/_index.html | 20 +- doc/file.README.html | 47 ++- doc/index.html | 47 ++- doc/puppet_class_list.html | 32 +- doc/puppet_classes/confdroid_alloy.html | 121 ++++++ ...confdroid_alloy_3A_3Amain_3A_3Aconfig.html | 130 ++++++ .../confdroid_alloy_3A_3Amain_3A_3Adirs.html | 154 +++++++ .../confdroid_alloy_3A_3Amain_3A_3Afiles.html | 222 ++++++++++ ...onfdroid_alloy_3A_3Amain_3A_3Ainstall.html | 138 +++++++ ...onfdroid_alloy_3A_3Amain_3A_3Aservice.html | 144 +++++++ ...onfdroid_alloy_3A_3Amain_3A_3Ayumrepo.html | 150 +++++++ .../confdroid_alloy_3A_3Aparams.html | 382 ++++++++++++++++++ 14 files changed, 1547 insertions(+), 179 deletions(-) delete mode 100644 .vscode/settings.json delete mode 100644 Jenkinsfile create mode 100644 doc/puppet_classes/confdroid_alloy.html create mode 100644 doc/puppet_classes/confdroid_alloy_3A_3Amain_3A_3Aconfig.html create mode 100644 doc/puppet_classes/confdroid_alloy_3A_3Amain_3A_3Adirs.html create mode 100644 doc/puppet_classes/confdroid_alloy_3A_3Amain_3A_3Afiles.html create mode 100644 doc/puppet_classes/confdroid_alloy_3A_3Amain_3A_3Ainstall.html create mode 100644 doc/puppet_classes/confdroid_alloy_3A_3Amain_3A_3Aservice.html create mode 100644 doc/puppet_classes/confdroid_alloy_3A_3Amain_3A_3Ayumrepo.html create mode 100644 doc/puppet_classes/confdroid_alloy_3A_3Aparams.html diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 54b2f27..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "cSpell.words": [ - "endscript", - "maillog", - "missingok", - "postrotate", - "sharedscripts", - "syslogs", - "userpass", - "yumrepo" - ] -} \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 683a7bf..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_alloy \ - -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_alloy.git - git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \ - push master --mirror - ''' - } - } - } - } - } - } -} \ No newline at end of file diff --git a/doc/_index.html b/doc/_index.html index 6742f94..ba82656 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -64,47 +64,47 @@ -