Skip to content

Preinstalled Ceph, Jenkins fixes #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ya-developer merged 1 commit into from
Feb 4, 2026
Merged

Preinstalled Ceph, Jenkins fixes #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion framework/inventory/jenkins.inventory
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions framework/inventory/microceph.inventory
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
}
}
2 changes: 0 additions & 2 deletions module/jenkins-stdl/setup/provision.step
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ blackbox.module.jenkins-stdl.setup.provision() {
blackbox.framework.inventory.provision jenkins

{
systemctl stop jenkins
systemctl daemon-reload
systemctl start jenkins
}

Expand Down