Skip to content

Commit

Permalink
install-deps.sh: fix install-deps script for focal and bionic
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
ljflores committed Sep 7, 2022
1 parent 7c73866 commit 0d2a5f3
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions install-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 0d2a5f3

Please sign in to comment.