Merge branch 'jenkins-build-12' into 'master'

Auto-merge for build 12

See merge request puppet/confdroid_automatic!9

Jenkinsfile

@@ -1,130 +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_automatic \
-                -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 commit --amend --no-edit --allow-empty
-                git add -A && git commit -am "Recommit for updates in build $BUILD_NUMBER" || echo "No changes to commit"
-                git push -o merge_request.create \
-                         -o merge_request.target=master \
-                         -o merge_request.title="Auto-merge for build $BUILD_NUMBER" \
-                         -o merge_request.description="Automated changes from Jenkins build $BUILD_NUMBER" \
-                         -o merge_request.merge_when_pipeline_succeeds=true \
-                         origin jenkins-build-$BUILD_NUMBER
-            '''
-        }
-      }
-    }
-
-      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_automatic.git
-                  git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \
-                  push master --mirror
-                  '''
-          }
-        }
-      }
-    }
-  }
-}

doc/puppet_classes/confdroid_automatic_3A_3Aparams.html

@@ -300,6 +300,24 @@
         —
         <div class='inline'>
 <p>which host to use to send the email</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ac_excludepkgs</span>
+      
+      
+        <span class='type'>(<tt>Variant[String, Array[String]]</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>[]</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>packages to exclude from updates</p>
 </div>
       
     </li>
@@ -315,7 +333,6 @@
         <pre class="lines">
 
 
-18
 19
 20
 21
@@ -347,15 +364,23 @@
 47
 48
 49
-50</pre>
+50
+51
+52
+53
+54
+55
+56
+57</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 18</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 19</span>
 
 class confdroid_automatic::params (
 
-  String $ac_reqpackages                 = &#39;dnf-automatic&#39;,
+  String $ac_reqpackages                          = &#39;dnf-automatic&#39;,
-  String $ac_pkg_ensure                  = &#39;latest&#39;,
+  String $ac_pkg_ensure                           = &#39;latest&#39;,
+  Variant[String, Array[String]] $ac_excludepkgs  = [],
 
   # updates
   String $ac_upgrade_type             = &#39;default&#39;,
@@ -382,6 +407,11 @@ class confdroid_automatic::params (
   $ac_main_config           = &#39;/etc/dnf/automatic.conf&#39;
   $ac_main_config_erb       = &#39;confdroid_automatic/automatic.conf.erb&#39;
 
+  $ac_excludepkgs_normalized = $ac_excludepkgs ? {
+    Array   =&gt; join($ac_excludepkgs, &#39;,&#39;),
+    default =&gt; $ac_excludepkgs,
+  }
+
 # includes must be last
   include confdroid_automatic::main::config
 }</pre>

manifests/params.pp

@@ -14,11 +14,13 @@
 # @param [String] ac_emit_via  how to inform about emitted updates
 # @param [String] ac_email_to where to send the email to
 # @param [String] ac_email_host which host to use to send the email
+# @param [Variant[String,Array[String]]] ac_excludepkgs packages to exclude from updates
 ##############################################################################
 class confdroid_automatic::params (
 
-  String $ac_reqpackages                 = 'dnf-automatic',
+  String $ac_reqpackages                          = 'dnf-automatic',
-  String $ac_pkg_ensure                  = 'latest',
+  String $ac_pkg_ensure                           = 'latest',
+  Variant[String, Array[String]] $ac_excludepkgs  = [],
 
   # updates
   String $ac_upgrade_type             = 'default',
@@ -45,6 +47,11 @@ class confdroid_automatic::params (
   $ac_main_config           = '/etc/dnf/automatic.conf'
   $ac_main_config_erb       = 'confdroid_automatic/automatic.conf.erb'
 
+  $ac_excludepkgs_normalized = $ac_excludepkgs ? {
+    Array   => join($ac_excludepkgs, ','),
+    default => $ac_excludepkgs,
+  }
+
 # includes must be last
   include confdroid_automatic::main::config
 }

templates/automatic.conf.erb

@@ -93,5 +93,9 @@ email_to                    = <%= @ac_email_to %>
 [base]
 # This section overrides dnf.conf
 
+<% unless @ac_excludepkgs_normalized.empty? -%>
+excludepkgs = <%= @ac_excludepkgs_normalized %>
+<% end -%>
+
 # Use this to filter DNF core messages
 debuglevel = 1