From 5b95d566173e9c757c9f04b71fbbb1a67f4adffd Mon Sep 17 00:00:00 2001
From: Diego Rodriguez <diego.rodriguez@cern.ch>
Date: Fri, 18 Sep 2020 17:36:40 +0200
Subject: [PATCH] cli: fix cluster-deploy

* Updates and installs modules whenever the cluster is redeployed
  in debug mode as new code might come in.

* Removes python-install-eggs from cluster-build as the build only
  needs the submodule sources.
---
 reana/reana_dev/cluster.py   | 26 +++++++++++++++-----------
 scripts/create-admin-user.sh |  2 +-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/reana/reana_dev/cluster.py b/reana/reana_dev/cluster.py
index 69110b40..1b0fd7e4 100644
--- a/reana/reana_dev/cluster.py
+++ b/reana/reana_dev/cluster.py
@@ -192,8 +192,6 @@ def cluster_build(
     # initalise common submodules
     if mode in ("latest", "debug"):
         cmds.append("reana-dev git-submodule --update")
-    if mode in ("debug"):
-        cmds.append("reana-dev python-install-eggs")
     # build Docker images
     cmd = "reana-dev docker-build"
     if exclude_components:
@@ -319,15 +317,21 @@ def job_mounts_to_config(job_mounts):
     helm_install = "cat <<EOF | helm install reana helm/reana -n {namespace} --create-namespace --wait -f -\n{values}\nEOF".format(
         namespace=namespace, values=values_dict and yaml.dump(values_dict) or "",
     )
-    cmds = [
-        "helm dep update helm/reana",
-        helm_install,
-        "kubectl config set-context --current --namespace={}".format(namespace),
-        os.path.join(
-            get_srcdir("reana"),
-            f"scripts/create-admin-user.sh {instance_name} {admin_email} {admin_password}",
-        ),
-    ]
+    cmds = []
+    if mode in ("debug"):
+        cmds.append("reana-dev git-submodule --update")
+        cmds.append("reana-dev python-install-eggs")
+    cmds.extend(
+        [
+            "helm dep update helm/reana",
+            helm_install,
+            "kubectl config set-context --current --namespace={}".format(namespace),
+            os.path.join(
+                get_srcdir("reana"),
+                f"scripts/create-admin-user.sh {instance_name} {admin_email} {admin_password}",
+            ),
+        ]
+    )
     for cmd in cmds:
         run_command(cmd, "reana")
 
diff --git a/scripts/create-admin-user.sh b/scripts/create-admin-user.sh
index fa22ae52..62a306c7 100755
--- a/scripts/create-admin-user.sh
+++ b/scripts/create-admin-user.sh
@@ -27,7 +27,7 @@ fi
 while [ "0" -ne "$(kubectl exec deployment/reana-db -- pg_isready -U reana -h 127.0.0.1 -p 5432 &> /dev/null && echo $? || echo 1)" ]
 do
     echo "Waiting for deployment/reana-db to be ready..."
-    sleep 5
+    sleep 10
 done
 
 # Initialise database