update ceph source to reef 18.2.0

[ceph.git] / ceph / src / pybind / mgr / dashboard / ci / cephadm / start-cluster.sh

diff --git a/ceph/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh b/ceph/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh
index 26fbd8a7c4b699f194280d2075e845ad203430c3..65cb78a45a063b9641aece4e71c4623a7f466790 100755 (executable)
--- a/ceph/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh
+++ b/ceph/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh
@@ -2,17 +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
-        docker container prune -f
-        echo "Cleanup completed."
-    fi
-}
-
 on_error() {
     set +x
     if [ "$1" != "0" ]; then
@@ -39,9 +28,8 @@ on_error() {
 }
 
 trap 'on_error $? $LINENO' ERR
-trap 'cleanup $? $LINENO' EXIT
 
-sed -i '/ceph-node-/d' $HOME/.ssh/known_hosts
+sed -i '/ceph-node-/d' $HOME/.ssh/known_hosts || true
 
 : ${CEPH_DEV_FOLDER:=${PWD}}
 EXTRA_PARAMS=''
@@ -64,15 +52,15 @@ if [[ -n "$JENKINS_HOME" ]]; then
     npm cache clean --force
 fi
 npm ci
-FRONTEND_BUILD_OPTS='-- --prod'
+FRONTEND_BUILD_OPTS='--configuration=production'
 if [[ -n "${DEV_MODE}" ]]; then
     FRONTEND_BUILD_OPTS+=' --deleteOutputPath=false --watch'
 fi
 npm run build ${FRONTEND_BUILD_OPTS} &
 
 cd ${CEPH_DEV_FOLDER}
-: ${VM_IMAGE:='fedora34'}
-: ${VM_IMAGE_URL:='https://fedora.mirror.liteserver.nl/linux/releases/34/Cloud/x86_64/images/Fedora-Cloud-Base-34-1.2.x86_64.qcow2'}
+: ${VM_IMAGE:='fedora36'}
+: ${VM_IMAGE_URL:='https://download.fedoraproject.org/pub/fedora/linux/releases/36/Cloud/x86_64/images/Fedora-Cloud-Base-36-1.5.x86_64.qcow2'}
 kcli download image -p ceph-dashboard -u ${VM_IMAGE_URL} ${VM_IMAGE}
 kcli delete plan -y ceph || true
 kcli create plan -f src/pybind/mgr/dashboard/ci/cephadm/ceph_cluster.yml \