From 8474311b1805edc2961766da669b008c5c01d0e9 Mon Sep 17 00:00:00 2001 From: Nizamudeen A Date: Fri, 7 Jul 2023 16:16:00 +0530 Subject: [PATCH] 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) --- .../mgr/dashboard/ci/cephadm/start-cluster.sh | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh b/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh index e86cec82bc9ce..0d6e8a5dd53af 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 -- 2.39.5