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

Auto-merge for build 5

See merge request puppet/confdroid_automatic!4

Jenkinsfile

@@ -1,134 +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 .scannerwork || echo "No .scannerwork to remove from git"
-                git rm -r --cached .yardoc || echo "No .yardoc to remove from git"
-                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 .scannerwork || echo "No .scannerwork to remove from git"
-                  git rm -r --cached .yardoc || echo "No .yardoc to remove from git"
-                  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

@@ -273,10 +273,10 @@
         <span class='name'>ac_email_to</span>
       
       
-        <span class='type'>(<tt>Array[String]</tt>)</span>
+        <span class='type'>(<tt>String</tt>)</span>
       
       
-        <em class="default">(defaults to: <tt>[&#39;root@example.net&#39;,&#39;ops@example.net&#39;]</tt>)</em>
+        <em class="default">(defaults to: <tt>&#39;root@example.net&#39;</tt>)</em>
       
       
         &mdash;
@@ -365,7 +365,7 @@ class confdroid_automatic::params (
   String $ac_apply_updates            = &#39;yes&#39;,
   String $ac_reboot                   = &#39;never&#39;,
   String $ac_emit_via                 = &#39;email&#39;,
-  Array[String] $ac_email_to           = [&#39;root@example.net&#39;,&#39;ops@example.net&#39;],
+  String $ac_email_to                 = &#39;root@example.net&#39;,
   String $ac_email_host               = &#39;localhost&#39;,
 
 ) {

manifests/params.pp

@@ -12,7 +12,7 @@
 # @param [String] ac_apply_updates whether to apply available updates
 # @param [String] ac_reboot when to reboot after applied updates
 # @param [String] ac_emit_via  how to inform about emitted updates
-# @param [Array[String]] ac_email_to where to send the email to
+# @param [String] ac_email_to where to send the email to
 # @param [String] ac_email_host which host to use to send the email
 ##############################################################################
 class confdroid_automatic::params (
@@ -28,7 +28,7 @@ class confdroid_automatic::params (
   String $ac_apply_updates            = 'yes',
   String $ac_reboot                   = 'never',
   String $ac_emit_via                 = 'email',
-  Array[String] $ac_email_to           = ['root@example.net','ops@example.net'],
+  String $ac_email_to                 = 'root@example.net',
   String $ac_email_host               = 'localhost',
 
 ) {