From d59d327b99dc53f1bfa8d81bc20622e7c090ccae Mon Sep 17 00:00:00 2001
From: Mikhail Ryzhikov <i@developer.com.ua>
Date: Wed, 4 Feb 2026 16:32:04 +0200
Subject: [PATCH] Preinstalled Ceph, Jenkins fixes

---
 framework/inventory/jenkins.inventory    | 2 +-
 framework/inventory/microceph.inventory  | 7 +++++--
 module/jenkins-stdl/setup/provision.step | 2 --
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/framework/inventory/jenkins.inventory b/framework/inventory/jenkins.inventory
index 70f097f..df6f6b6 100644
--- a/framework/inventory/jenkins.inventory
+++ b/framework/inventory/jenkins.inventory
@@ -27,7 +27,7 @@ blackbox.framework.inventory.jenkins() {
 
   {
     # preinstalled setup fix: the existing jenkins installation is outdated for Ubuntu 24.04
-    apt remove --purge jenkins
+    apt remove -y --purge jenkins
   }
 
   if ( dpkg-query -L "$package_name" "${with_packages[@]}" &>/dev/null ); then
diff --git a/framework/inventory/microceph.inventory b/framework/inventory/microceph.inventory
index d15dac0..bf82f9b 100644
--- a/framework/inventory/microceph.inventory
+++ b/framework/inventory/microceph.inventory
@@ -25,6 +25,11 @@ blackbox.framework.inventory.microceph() {
 
   sed "s/\x1b\[[0-9;]*m//g" <(dpkg-query -W "$package_name" "${with_packages[@]}" 2>&1)
 
+  {
+    # preinstalled setup fix: the existing jenkins installation is outdated for Ubuntu 24.04
+    snap remove microceph
+  }
+
   if ( dpkg-query -L "$package_name" "${with_packages[@]}" &>/dev/null ); then
     false
 
@@ -43,8 +48,6 @@ blackbox.framework.inventory.microceph() {
 
   {
     rm -rf /etc/ceph
-    # preinstalled setup fix
-    snap restart microceph.daemon
     ln -s /var/snap/microceph/current/conf /etc/ceph
   }
 }
diff --git a/module/jenkins-stdl/setup/provision.step b/module/jenkins-stdl/setup/provision.step
index 44620e5..c604471 100644
--- a/module/jenkins-stdl/setup/provision.step
+++ b/module/jenkins-stdl/setup/provision.step
@@ -26,8 +26,6 @@ blackbox.module.jenkins-stdl.setup.provision() {
   blackbox.framework.inventory.provision jenkins
 
   {
-    systemctl stop jenkins
-    systemctl daemon-reload
     systemctl start jenkins
   }