Skip to content

Commit a6fc672

Browse files
authored
Merge pull request ceph#52355 from rhcs-dashboard/cleanup-script-remove-dash-cephadm-e2e
mgr/dashboard: move cephadm e2e cleanup to jenkins job config Reviewed-by: Avan Thakkar <[email protected]> Reviewed-by: Ernesto Puerta <[email protected]>
2 parents 1b6160a + a407f0b commit a6fc672

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,6 @@
22

33
set -eEx
44

5-
cleanup() {
6-
set +x
7-
if [[ -n "$JENKINS_HOME" ]]; then
8-
echo "Starting cleanup..."
9-
kcli delete plan -y ceph || true
10-
kcli delete network ceph-dashboard -y
11-
kcli delete pool ceph-dashboard -y
12-
rm -rf ${HOME}/.kcli
13-
docker container prune -f
14-
echo "Cleanup completed."
15-
fi
16-
}
17-
185
on_error() {
196
set +x
207
if [ "$1" != "0" ]; then
@@ -41,7 +28,6 @@ on_error() {
4128
}
4229

4330
trap 'on_error $? $LINENO' ERR
44-
trap 'cleanup $? $LINENO' EXIT
4531

4632
sed -i '/ceph-node-/d' $HOME/.ssh/known_hosts || true
4733

0 commit comments

Comments
 (0)