Merge build 37 into master

Auto-merge for build 34

See merge request puppet/confdroid_ssh!34

Jenkinsfile

@@ -28,11 +28,17 @@ pipeline {
             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 fetch origin
-                git checkout development
+              source_branch="${gitlabSourceBranch:-${BRANCH_NAME:-${GIT_LOCAL_BRANCH:-$GIT_BRANCH}}}"
-                # Create jenkins branch from development
+              source_branch="${source_branch#origin/}"
-                git checkout -b jenkins-build-$BUILD_NUMBER
+              source_branch="${source_branch#refs/heads/}"
-                # Optionally merge master into jenkins to ensure compatibility
+              if [ -z "$source_branch" ]; then
+                source_branch="development"
+              fi
+              echo "Using source branch: $source_branch"
+              # Create an isolated build branch from the triggering branch revision.
+              git checkout -B jenkins-build-$BUILD_NUMBER "origin/$source_branch"
+                # Merge the current master into the build branch before validation.
                 git merge origin/master --no-ff || { echo "Merge conflict detected"; exit 1; }
             '''
         }
@@ -91,12 +97,10 @@ pipeline {
                 git config user.name "Jenkins Server"
                 git config user.email jenkins@confdroid.com
                 git add -A && git commit -am "Recommit for updates in build $BUILD_NUMBER" || echo "No changes to commit"
-                git push -o merge_request.create \
+                git fetch origin
-                         -o merge_request.target=master \
+                git checkout -B master origin/master
-                         -o merge_request.title="Auto-merge for build $BUILD_NUMBER" \
+                git merge --no-ff jenkins-build-$BUILD_NUMBER -m "Merge build $BUILD_NUMBER into master"
-                         -o merge_request.description="Automated changes from Jenkins build $BUILD_NUMBER" \
+                git push origin master
-                         -o merge_request.merge_when_pipeline_succeeds=true \
-                         origin jenkins-build-$BUILD_NUMBER
             '''
         }
       }
@@ -108,19 +112,15 @@ pipeline {
             usernameVariable: 'GITEA_USER',
             passwordVariable: 'GITEA_TOKEN')]) {
             script {
-              // Checkout from GitLab (already done implicitly)
                 sh '''
+                  git fetch origin
                   git checkout master
-                  git pull origin master
+                  git reset --hard origin/master
-                  git branch -D development
+                  git remote get-url master >/dev/null 2>&1 \
-                  git branch -D jenkins-build-$BUILD_NUMBER
+                    && git remote set-url master https://sourcecode.confdroid.com/confdroid/confdroid_ssh.git \
-                  git rm -f Jenkinsfile
+                    || git remote add master https://sourcecode.confdroid.com/confdroid/confdroid_ssh.git
-                  git rm -r --cached .vscode || echo "No .vscode to remove from git"
-                  git rm -r --cached .puppet-lint.rc || echo "No .puppet-lint.rc to remove from git"
-                  git commit --amend --no-edit --allow-empty
-                  git remote add master https://sourcecode.confdroid.com/confdroid/confdroid_ssh.git
                   git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \
-                  push master --mirror
+                  push --force master refs/heads/master:refs/heads/master
                   '''
           }
         }

README.md

@@ -25,10 +25,12 @@
 ## Features
 
 - install required binaries
-- manage selinux rules
+- manage required files and directories including selinux context 
 - manage service
 - (optional) manage firewall
 
+> ToDo: Define for custom drop-in configurations
+
 ## Support
 
 - Rocky 9 (Any RHEL 9 based OS should work but has not been tested)

doc/file.README.html

@@ -97,13 +97,17 @@
 <ul><li>
 <p>install required binaries</p>
 </li><li>
-<p>manage selinux rules</p>
+<p>manage required files and directories including selinux context</p>
 </li><li>
 <p>manage service</p>
 </li><li>
 <p>(optional) manage firewall</p>
 </li></ul>
 
+<blockquote>
+<p>ToDo: Define for custom drop-in configurations</p>
+</blockquote>
+
 <h2 id="label-Support">Support</h2>
 <ul><li>
 <p>Rocky 9 (Any RHEL 9 based OS should work but has not been tested)</p>

doc/index.html

@@ -97,13 +97,17 @@
 <ul><li>
 <p>install required binaries</p>
 </li><li>
-<p>manage selinux rules</p>
+<p>manage required files and directories including selinux context</p>
 </li><li>
 <p>manage service</p>
 </li><li>
 <p>(optional) manage firewall</p>
 </li></ul>
 
+<blockquote>
+<p>ToDo: Define for custom drop-in configurations</p>
+</blockquote>
+
 <h2 id="label-Support">Support</h2>
 <ul><li>
 <p>Rocky 9 (Any RHEL 9 based OS should work but has not been tested)</p>