From 0d2a5f3466a8f078dfa20dccb8b2234611bdf6f6 Mon Sep 17 00:00:00 2001 From: Laura Flores Date: Wed, 7 Sep 2022 19:45:57 +0000 Subject: [PATCH] install-deps.sh: fix install-deps script for focal and bionic When run on focal and bionic, install-deps ends early due to this extra debug message that was added to the end of `ensure_decent_gcc_on_ubuntu`. The debug message prints when the script is run in a jenkins environment. When the script is not run in a jenkins environment, the value returned there is "false" or "0", which acts as an early return. This stops the script from completing. We can remove this line, as `ensure_decent_gcc_on_ubuntu` is only called for focal and bionic, and most of the jenkins nodes are running jammy. Also, there is a debug message at the beginning of the function that should suffice. Fixes: https://tracker.ceph.com/issues/57466 Signed-off-by: Laura Flores --- install-deps.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/install-deps.sh b/install-deps.sh index e14e16274ed..20970ab8c78 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -96,8 +96,6 @@ ENDOFKEY $SUDO env DEBIAN_FRONTEND=noninteractive apt-get update -y || true $SUDO env DEBIAN_FRONTEND=noninteractive apt-get install -y g++-${new} fi - - in_jenkins && echo "CI_DEBUG: End ensure_decent_gcc_on_ubuntu() in install-deps.sh" } function ensure_python3_sphinx_on_ubuntu { -- 2.39.5