From 6f3addff5bdbdddeed673ad14d001683af83b8c7 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Tue, 22 Sep 2026 13:55:53 +0200 Subject: [PATCH] Recommit for updates in build 12 --- .vscode/settings.json | 62 --------- Jenkinsfile | 128 ------------------ doc/_index.html | 5 - doc/puppet_class_list.html | 7 - ...onfdroid_clamav_3A_3Amain_3A_3Aconfig.html | 2 +- .../confdroid_clamav_3A_3Amain_3A_3Adirs.html | 2 +- ...confdroid_clamav_3A_3Amain_3A_3Afiles.html | 2 +- ...nfdroid_clamav_3A_3Amain_3A_3Ainstall.html | 2 +- ...nfdroid_clamav_3A_3Amain_3A_3Aservice.html | 2 +- 9 files changed, 5 insertions(+), 207 deletions(-) delete mode 100644 .vscode/settings.json delete mode 100644 Jenkinsfile diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 31d7fc0..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "cSpell.words": [ - "ALLMATCHSCAN", - "authenticode", - "behaviour", - "bofh", - "clamav", - "clamd", - "clamdscan", - "clamonacc", - "clamscan", - "Clamuko", - "clamupdate", - "concurrentdatabasereload", - "Dazuko", - "dbname", - "epel", - "excludepaths", - "fanotify", - "fdpass", - "filesize", - "freshclam", - "getsebool", - "INADDR", - "kubelet", - "libclamav", - "logclean", - "logfacility", - "logfile", - "logfilemaxsize", - "logfileunlock", - "logrotation", - "logsyslog", - "logtime", - "logverbose", - "MAINPID", - "multiscan", - "mypass", - "myproxy", - "myusername", - "NOFILE", - "normalisation", - "PCRE", - "pipefail", - "preludeanalyzername", - "preludeenable", - "recieve", - "RLIMIT", - "safebrowsing", - "setsebool", - "subsig", - "subsigs", - "tcpaddre", - "tcpaddress", - "tcpsocket", - "VIRUSEVENT", - "virusgroup", - "VIRUSNAME", - "XMLDOCS", - "xxxyyzzzz" - ] -} \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 3de3324..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,128 +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_clamav \ - -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_clamav.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 c845e3e..be4356a 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -98,11 +98,6 @@ -
  • - confdroid_clamav::params - -
    • - diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index a44a0df..e66e5ea 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -78,13 +78,6 @@ -
  • -
    - confdroid_clamav::params -
    -
    • - - diff --git a/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Aconfig.html index 111b681..01dfb83 100644 --- a/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Aconfig.html @@ -64,7 +64,7 @@
    Inherits:
    -
    confdroid_clamav::params
    +
    confdroid_clamav::params
    diff --git a/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Adirs.html index e701f74..dddd296 100644 --- a/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Adirs.html @@ -64,7 +64,7 @@
    Inherits:
    -
    confdroid_clamav::params
    +
    confdroid_clamav::params
    diff --git a/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Afiles.html b/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Afiles.html index 4be93f9..b3f6879 100644 --- a/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Afiles.html @@ -64,7 +64,7 @@
    Inherits:
    -
    confdroid_clamav::params
    +
    confdroid_clamav::params
    diff --git a/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Ainstall.html index 3bae371..eed7d18 100644 --- a/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Ainstall.html @@ -64,7 +64,7 @@
    Inherits:
    -
    confdroid_clamav::params
    +
    confdroid_clamav::params
    diff --git a/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Aservice.html b/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Aservice.html index f61b19d..cad784d 100644 --- a/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Aservice.html +++ b/doc/puppet_classes/confdroid_clamav_3A_3Amain_3A_3Aservice.html @@ -64,7 +64,7 @@
    Inherits:
    -
    confdroid_clamav::params
    +
    confdroid_clamav::params