import quincy beta 17.1.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 68c49bb11422458250d66ee84bb76190f032cb76..74ebb1c5f622af980e3583f4f1eddeb6f70e6294 100755 (executable)
--- a/ceph/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh
+++ b/ceph/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh
@@ -1,12 +1,13 @@
 #!/usr/bin/env bash
 
-set -ex
+set -eEx
 
 cleanup() {
     set +x
     if [[ -n "$JENKINS_HOME" ]]; then
         printf "\n\nStarting cleanup...\n\n"
         kcli delete plan -y ceph || true
+        kcli delete network ceph-dashboard -y
         docker container prune -f
         printf "\n\nCleanup completed.\n\n"
     fi
@@ -18,7 +19,7 @@ on_error() {
         printf "\n\nERROR $1 thrown on line $2\n\n"
         printf "\n\nCollecting info...\n\n"
         printf "\n\nDisplaying MGR logs:\n\n"
-        kcli ssh -u root -- ceph-node-00 'cephadm logs -n $(cephadm ls | grep -Eo "mgr\.ceph[0-9a-z.-]+" | head -n 1)'
+        kcli ssh -u root -- ceph-node-00 'cephadm logs -n \$(cephadm ls | grep -Eo "mgr\.ceph[0-9a-z.-]+" | head -n 1) -- --no-tail --no-pager'
         for vm_id in 0 1 2
         do
             local vm="ceph-node-0${vm_id}"
@@ -26,7 +27,7 @@ on_error() {
             kcli ssh -u root -- ${vm} 'journalctl --no-tail --no-pager -t cloud-init' || true
             printf "\n\nEnd of journalctl from VM ${vm}\n\n"
             printf "\n\nDisplaying container logs:\n\n"
-            kcli ssh -u root -- ${vm} 'podman logs --names --since 30s $(podman ps -aq)' || true
+            kcli ssh -u root -- ${vm} 'podman logs --names --since 30s \$(podman ps -aq)' || true
         done
         printf "\n\nTEST FAILED.\n\n"
     fi
@@ -69,18 +70,18 @@ cd ${CEPH_DEV_FOLDER}
 : ${VM_IMAGE_URL:='https://fedora.mirror.liteserver.nl/linux/releases/34/Cloud/x86_64/images/Fedora-Cloud-Base-34-1.2.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 \
+kcli create plan -f src/pybind/mgr/dashboard/ci/cephadm/ceph_cluster.yml \
     -P ceph_dev_folder=${CEPH_DEV_FOLDER} \
     ${EXTRA_PARAMS} ceph
 
 : ${CLUSTER_DEBUG:=0}
 : ${DASHBOARD_CHECK_INTERVAL:=10}
-while [[ -z $(kcli ssh -u root -- ceph-node-00 'journalctl --no-tail --no-pager -t cloud-init' | grep "Dashboard is now available") ]]; do
+while [[ -z $(kcli ssh -u root -- ceph-node-00 'journalctl --no-tail --no-pager -t cloud-init' | grep "kcli boot finished") ]]; do
     sleep ${DASHBOARD_CHECK_INTERVAL}
     kcli list vm
     if [[ ${CLUSTER_DEBUG} != 0 ]]; then
         kcli ssh -u root -- ceph-node-00 'podman ps -a'
-        kcli ssh -u root -- ceph-node-00 'podman logs --names --since 30s $(podman ps -aq)'
+        kcli ssh -u root -- ceph-node-00 'podman logs --names --since 30s \$(podman ps -aq)'
     fi
     kcli ssh -u root -- ceph-node-00 'journalctl -n 100 --no-pager -t cloud-init'
 done