From 9aedeaf2012851fd3598bb9c8f4a347bdc58a330 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alfonso=20Mart=C3=ADnez?= Date: Mon, 20 Dec 2021 09:12:37 +0100 Subject: [PATCH] mgr/dashboard: cephadm e2e job: improvements MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit - Avoid jenkins env. error: Input file /workdir/./src/pybind/mgr/dashboard/ci/cephadm/ceph_cluster.yml not found.Leaving... - More meaningful log output. Fixes: https://tracker.ceph.com/issues/53666 Signed-off-by: Alfonso Martínez --- src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh | 2 ++ src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh b/src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh index 439b8e9abe0..ca663b5ba5b 100755 --- a/src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh +++ b/src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -x + export PATH=/root/bin:$PATH mkdir /root/bin diff --git a/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh b/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh index 68c49bb1142..b7e1a9875f5 100755 --- a/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh +++ b/src/pybind/mgr/dashboard/ci/cephadm/start-cluster.sh @@ -69,13 +69,13 @@ 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 -- 2.47.3