dashboard-cephadm-e2e: silence a few errors

Change directory before trying to open files from it.
Silences one Jenkins Indication.

Don't try to do docker logs unless docker had something running.
Removes some error lines in Jenkins console log.

Signed-off-by: Ville Ojamo <14869000+bluikko@users.noreply.github.com>

diff --git a/scripts/dashboard/install-cephadm-e2e-deps.sh b/scripts/dashboard/install-cephadm-e2e-deps.sh
index 7e5ab462564146ad7f3f3b3c8b02c01b345fd260..459491ef9f04abd3a3e944f72e6ea485e6c2892b 100644 (file)
--- a/scripts/dashboard/install-cephadm-e2e-deps.sh
+++ b/scripts/dashboard/install-cephadm-e2e-deps.sh
@@ -8,7 +8,7 @@ on_error() {
         printf "\n\nCollecting info...\n\n"
         sudo journalctl --since "10 min ago" --no-tail --no-pager -x
         printf "\n\nERROR: displaying containers' logs:\n\n"
-        docker ps -aq | xargs docker logs
+        docker ps -aq | xargs -r docker logs
         printf "\n\nTEST FAILED.\n\n"
     fi
 }
@@ -32,8 +32,9 @@ if [[ ! $(command -v nvm) ]]; then
     [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
 fi
 
-echo "Installing nodejs from nvm with version $(cat .nvmrc)"
 pushd src/pybind/mgr/dashboard/frontend
+
+echo "Installing nodejs from nvm with version $(cat .nvmrc)"
 nvm install
 nvm use
 popd