From ca9d4477c2bb54500b692b3ba8a2c5294b41480a Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sun, 2 Aug 2026 15:08:22 +0200 Subject: [PATCH] Recommit for updates in build 2 --- Jenkinsfile | 127 ----------------- doc/_index.html | 5 + doc/file.README.html | 4 +- doc/index.html | 4 +- doc/puppet_class_list.html | 9 +- ...fdroid_firewall_3A_3Amain_3A_3Aconfig.html | 4 +- ...droid_firewall_3A_3Amain_3A_3Ainstall.html | 134 ++++++++++++++++++ .../confdroid_firewall_3A_3Aparams.html | 60 +++++++- 8 files changed, 208 insertions(+), 139 deletions(-) delete mode 100644 Jenkinsfile create mode 100644 doc/puppet_classes/confdroid_firewall_3A_3Amain_3A_3Ainstall.html diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 98cdb2a..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_firewall \ - -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_firewall.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 cb0d627..6829747 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -78,6 +78,11 @@ +
  • + confdroid_firewall::main::install + +
    • +
  • confdroid_firewall::params diff --git a/doc/file.README.html b/doc/file.README.html index f4f6b48..5a3a028 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -60,9 +60,7 @@

    Readme

    -

    - -

    +

    • Readme

    • diff --git a/doc/index.html b/doc/index.html index 138a8a7..73b50dc 100644 --- a/doc/index.html +++ b/doc/index.html @@ -60,9 +60,7 @@

      Readme

      -

      - -

      +

      • Readme

      • diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index f1a8f66..053888c 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -50,7 +50,14 @@
        • -
      • +
      • +
        + confdroid_firewall::main::install +
        +
        • + + +
      • confdroid_firewall::params
        diff --git a/doc/puppet_classes/confdroid_firewall_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/confdroid_firewall_3A_3Amain_3A_3Aconfig.html index 70871aa..0f12e57 100644 --- a/doc/puppet_classes/confdroid_firewall_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/confdroid_firewall_3A_3Amain_3A_3Aconfig.html @@ -104,7 +104,8 @@ 6 7 8 -9 +9 +10 
        # File 'manifests/main/config.pp', line 6
@@ -112,6 +113,7 @@
 class confdroid_firewall::main::config (
 
 ) inherits confdroid_firewall::params {
+  include confdroid_firewall::main::install
 }
        diff --git a/doc/puppet_classes/confdroid_firewall_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/confdroid_firewall_3A_3Amain_3A_3Ainstall.html new file mode 100644 index 0000000..4b2b414 --- /dev/null +++ b/doc/puppet_classes/confdroid_firewall_3A_3Amain_3A_3Ainstall.html @@ -0,0 +1,134 @@ + + + + + + + Puppet Class: confdroid_firewall::main::install + + — Documentation by YARD 0.9.36 + + + + + + + + + + + + + + + + + +
        + +
        +
        + +
        + + +

        Puppet Class: confdroid_firewall::main::install

        +
        + +
        +
        Inherits:
        +
        confdroid_firewall::params
        +
        + + +
        +
        Defined in:
        +
        + manifests/main/install.pp +
        +
        +
        + +

        Summary

        + Class manages installation logic for the confdroid_firewall module + +

        Overview

        +
        +
        + +

        confdroid_firewall::main::install.pp Module name: confdroid_firewall Author: 12ww1160 (12ww1160@confdroid.com)

        + +
        +
        + + + +
        + + + +
        + + + + + +
        + 
        +
+
+6
+7
+8
+9
+10
+11
+12
        +         		+ 
        # File 'manifests/main/install.pp', line 6
+
+class confdroid_firewall::main::install (
+
+) inherits confdroid_firewall::params {
+  package { $fw_req_packages:
+    ensure => $fw_pkg_ensure,
+  }
+}
        +
        +
        +
        + + + +
        + + \ No newline at end of file diff --git a/doc/puppet_classes/confdroid_firewall_3A_3Aparams.html b/doc/puppet_classes/confdroid_firewall_3A_3Aparams.html index 4216dfb..05bed66 100644 --- a/doc/puppet_classes/confdroid_firewall_3A_3Aparams.html +++ b/doc/puppet_classes/confdroid_firewall_3A_3Aparams.html @@ -69,6 +69,8 @@ confdroid_firewall::main::config
        + confdroid_firewall::main::install
        + @@ -95,7 +97,49 @@
        +

        Parameters:

        +
          +
        • + + fw_req_packages + + + (Array) + + + (defaults to: ['nftables','iptables-nft']) + + + — +
          • +

            List of required packages

            +
          +
          + +
          • + +
        • + + fw_pkg_ensure + + + (String) + + + (defaults to: 'present') + + + — +
          • +

            Ensure state of required packages

            +
          +
          + +
          • + +
        +
        @@ -105,18 +149,26 @@ 
         
 
-6
-7
 8
 9
 10
-11
        +11 +12 +13 +14 +15 +16 +17 - 
        # File 'manifests/params.pp', line 6
+        
        # File 'manifests/params.pp', line 8
 
 class confdroid_firewall::params (
 
+  # Installation
+  Array $fw_req_packages  = ['nftables','iptables-nft'],
+  String $fw_pkg_ensure   = 'present',
+
 ) {
 # includes must be last in the class to avoid circular dependencies
   include confdroid_firewall::main::config