From: Nizamudeen A Date: Fri, 7 Jul 2023 10:46:00 +0000 (+0530) Subject: mgr/dashboard: move cephadm e2e cleanup to jenkins job config X-Git-Tag: v18.1.3~30^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=30bd7b4a8bb131b488a931b7906de992eaaf6e0d;p=ceph.git mgr/dashboard: move cephadm e2e cleanup to jenkins job config Follows: https://github.com/ceph/ceph-build/pull/2145 Signed-off-by: Nizamudeen A (cherry picked from commit a407f0b7834585c087001059d6cec613e524538b) --- diff --git a/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh b/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh index c8f9c07a050c6..65cb78a45a063 100755 --- a/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh +++ b/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh @@ -2,19 +2,6 @@ set -eEx -cleanup() { - set +x - if [[ -n "$JENKINS_HOME" ]]; then - echo "Starting cleanup..." - kcli delete plan -y ceph || true - kcli delete network ceph-dashboard -y - kcli delete pool ceph-dashboard -y - rm -rf ${HOME}/.kcli - docker container prune -f - echo "Cleanup completed." - fi -} - on_error() { set +x if [ "$1" != "0" ]; then @@ -41,7 +28,6 @@ on_error() { } trap 'on_error $? $LINENO' ERR -trap 'cleanup $? $LINENO' EXIT sed -i '/ceph-node-/d' $HOME/.ssh/known_hosts || true