Merge pull request #160 from ProblemSetters/preinstalled-ceph-jenkins-git-fixes

Preinstalled Ceph, Jenkins fixes

Author: ya-developer

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

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

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
   }