Skip to content

Commit 2bfc404

Browse files
authored
Merge pull request ceph#63722 from cbodley/wip-71562-tentacle
tentacle: run-make: work around package conflicts from llvm.sh Reviewed-by: Dan Mick <[email protected]> Reviewed-by: Matan Breizman <[email protected]>
2 parents 0e74c31 + 1cb4f57 commit 2bfc404

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

src/script/run-make.sh

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,29 @@ function prepare() {
5454
which_pkg="debianutils"
5555

5656
if in_jenkins; then
57-
if ! type clang-19 > /dev/null 2>&1 ; then
58-
ci_debug "Getting clang-19"
57+
wrap_sudo
58+
# require clang-19. uninstall previous versions to work around package conflicts
59+
local v=19
60+
local remove_from=13
61+
local remove_to=$(($v-1))
62+
ci_debug "Removing clang package versions from $remove_from-$remove_to"
63+
for i in $(seq $remove_from $remove_to); do
64+
$DRY_RUN $SUDO apt-get purge --auto-remove clang-$i lldb-$i lld-$i clangd-$i python3-lldb-$i -y || true
65+
done
66+
67+
if ! type clang-$v > /dev/null 2>&1 ; then
68+
ci_debug "Getting clang-$v"
5969
wget https://download.ceph.com/qa/llvm.sh
6070
chmod +x llvm.sh
61-
wrap_sudo
62-
$DRY_RUN $SUDO ./llvm.sh 19
71+
$DRY_RUN $SUDO ./llvm.sh $v
6372
rm llvm.sh
6473
fi
6574
fi
6675
fi
6776

6877
if test -f ./install-deps.sh ; then
6978
ci_debug "Running install-deps.sh"
70-
INSTALL_EXTRA_PACKAGES="ccache git $which_pkg clang lvm2"
79+
INSTALL_EXTRA_PACKAGES="ccache git $which_pkg lvm2"
7180
$DRY_RUN source ./install-deps.sh || return 1
7281
trap clean_up_after_myself EXIT
7382
fi

0 commit comments

Comments
 (0)