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

Auto-merge for build 8

See merge request puppet/confdroid_automatic!7

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
-                  '''
-          }
-        }
-      }
-    }
-  }
-}

README.md

@@ -22,6 +22,8 @@ dnf-automatic is a mechanism to allow automatic OS updates for Rocky 9 and simil
 
 `confdroid_automatic` manages dnf-automatic installations and configurations. 
 
+Choose the required update and reboot policy per host, host group, environment etc. Set the email notification about updates, that's all it needs.
+
 ## WARNING
 
 > **Attention: Never use this puppet module on systems which have been previously configured manually. It is impossible to predict how and what would have been configured, hence previous configurations outside the scope of this module may be overwritten! Automated configurations require a test environment to verify that the module suits the purpose intended by the user, as well as tune the parameters, before deploying into live production**
@@ -29,7 +31,7 @@ dnf-automatic is a mechanism to allow automatic OS updates for Rocky 9 and simil
 ## Features
 
 - install required binaries,
-- mane files and directories with proper selinux context
+- manage files and directories with proper selinux context
 - manage main configurations files via parameters
 - manage service
 
@@ -56,7 +58,7 @@ via site.pp or nodes.pp
 
 ```ruby
 node 'example.example.net' {
-  include automatic
+  include confdroid_automatic
 }
 ```
 
@@ -74,6 +76,7 @@ See [more details about class deployment on confdroid.com](https://confdroid.com
 - Puppet Parser
 - ERB Template Parser
 - Sonar Quality Gate
+- End-to-end deployments in Rocky-9 environments
 
 ## Contact Us
 

doc/file.README.html

@@ -93,6 +93,8 @@
 
 <p><code>confdroid_automatic</code> manages dnf-automatic installations and configurations.</p>
 
+<p>Choose the required update and reboot policy per host, host group, environment etc. Set the email notification about updates, that’s all it needs.</p>
+
 <h2 id="label-WARNING">WARNING</h2>
 
 <blockquote>
@@ -103,7 +105,7 @@
 <ul><li>
 <p>install required binaries,</p>
 </li><li>
-<p>mane files and directories with proper selinux context</p>
+<p>manage files and directories with proper selinux context</p>
 </li><li>
 <p>manage main configurations files via parameters</p>
 </li><li>
@@ -135,7 +137,7 @@
 <p>via site.pp or nodes.pp</p>
 
 <pre class="code ruby"><code class="ruby">node &#39;example.example.net&#39; {
-  include automatic
+  include confdroid_automatic
 }
 </code></pre>
 <ul><li>
@@ -160,6 +162,8 @@
 <p>ERB Template Parser</p>
 </li><li>
 <p>Sonar Quality Gate</p>
+</li><li>
+<p>End-to-end deployments in Rocky-9 environments</p>
 </li></ul>
 
 <h2 id="label-Contact+Us">Contact Us</h2>

doc/index.html

@@ -93,6 +93,8 @@
 
 <p><code>confdroid_automatic</code> manages dnf-automatic installations and configurations.</p>
 
+<p>Choose the required update and reboot policy per host, host group, environment etc. Set the email notification about updates, that’s all it needs.</p>
+
 <h2 id="label-WARNING">WARNING</h2>
 
 <blockquote>
@@ -103,7 +105,7 @@
 <ul><li>
 <p>install required binaries,</p>
 </li><li>
-<p>mane files and directories with proper selinux context</p>
+<p>manage files and directories with proper selinux context</p>
 </li><li>
 <p>manage main configurations files via parameters</p>
 </li><li>
@@ -135,7 +137,7 @@
 <p>via site.pp or nodes.pp</p>
 
 <pre class="code ruby"><code class="ruby">node &#39;example.example.net&#39; {
-  include automatic
+  include confdroid_automatic
 }
 </code></pre>
 <ul><li>
@@ -160,6 +162,8 @@
 <p>ERB Template Parser</p>
 </li><li>
 <p>Sonar Quality Gate</p>
+</li><li>
+<p>End-to-end deployments in Rocky-9 environments</p>
 </li></ul>
 
 <h2 id="label-Contact+Us">Contact Us</h2>