Merge branch 'slaprunner'

slapos/runner/gittools.py

@@ -40,8 +40,6 @@ def cloneRepo(data):
     code = 1
   except Exception as e:
     json = safeResult(str(e))
-    if os.path.exists(workDir):
-      shutil.rmtree(workDir)
   return jsonify(code=code, result=json)
 
 def gitStatus(project):

slapos/runner/templates/cloneRepository.html

@@ -22,9 +22,9 @@
     <div id="tab1" class="tabContents">
       <div id="repository" style="margin-left:40px;">
       <label for='name'>Project name: </label>
-      <input type="text" name="name" id="name" size='20' value="Enter the project name..." />
+      <input type="text" name="name" id="name" size='20' value="slapos" />
       <label for='repo'>&nbsp;url: &nbsp;&nbsp;</label>
-      <input type="text" name="repo" id="repo" size='25' value="Enter the url of your repository..." /><br/>
+      <input type="text" name="repo" id="repo" size='25' value="http://git.erp5.org/repos/slapos.git" /><br/>
       <label for='user'>Your name: &nbsp;&nbsp;&nbsp;</label>
       <input type="text" name="user" id="user" size='20' value="{{name}}" />
       <label for='email'>Email: </label>
@@ -39,36 +39,36 @@
       <div class="menu-box-right">
         <div style="background:#fff; padding:10px; min-height:100px; font-size:14px;">
         <div id="box0">
-      	<h2>Clone Repository without using HTTPS and SSH</h2><br/>
-      	<p>Choose this mode if you don't have login and password for the repository and you if you don't have the possibility to
-      	use SSH authentication. Otherwise use your public key or your login and password to clone your project by choosing https or ssh mode. Note
-      	that, with readonly mode you can not be able to push your changes.</p>
-      	<br/>
-      	</div>
-      	<div id="box1" style="display:none">
-      		<h2>You can use this public key to setup your repository</h2><br/>
-      		<textarea class="mb_style public_key" readonly>
-      		{{public_key}}
-      		</textarea>
-      	</div>
-      	<div id="box2" style="display:none;">
-      	<h2>Enter your username and password for https authentication access</h2><br/>
-      	<div style="margin-left:140px; margin-bottom:20px;">
-      	<label for='username'>Your username:&nbsp;&nbsp;</label>
-      	<input type="text" name="username" id="username" size='20' value="Enter your username..." /><br/><br/>
-      	<label for='password'>Your password: &nbsp;&nbsp;</label>
-      	<input type="password" name="password" id="password" size='20' value="" class="idleField" />
-      	</div>
-      	<p></p>
-      	</div>
-      	</div>
+          <h2>Clone Repository without using HTTPS and SSH</h2><br/>
+          <p>Choose this mode if you don't have login and password for the repository and you if you don't have the possibility to
+          use SSH authentication. Otherwise use your public key or your login and password to clone your project by choosing https or ssh mode. Note
+          that, with readonly mode you can not be able to push your changes.</p>
+          <br/>
+          </div>
+          <div id="box1" style="display:none">
+              <h2>You can use this public key to setup your repository</h2><br/>
+              <textarea class="mb_style public_key" readonly>
+              {{public_key}}
+              </textarea>
+          </div>
+          <div id="box2" style="display:none;">
+          <h2>Enter your username and password for https authentication access</h2><br/>
+          <div style="margin-left:140px; margin-bottom:20px;">
+          <label for='username'>Your username:&nbsp;&nbsp;</label>
+          <input type="text" name="username" id="username" size='20' value="Enter your username..." /><br/><br/>
+          <label for='password'>Your password: &nbsp;&nbsp;</label>
+          <input type="password" name="password" id="password" size='20' value="" class="idleField" />
+          </div>
+          <p></p>
+          </div>
+          </div>
       </div>
       <div class="menu-box-left">
-      	<ul id="modelist">
-      		<li class="checked"><input type="radio" name="security" id="nothing" value="nothing" /><label for="nothing">ReadOnly</label></li>
-      		<li><input type="radio" name="security" id="ssh" value="SSH" checked /><label for="ssh">SSH Mode</label></li>
-      		<li style="border-bottom:none"><input type="radio" name="security" id="https" value="HTTPS" /><label for="https">Https Mode</label></li>
-      	</ul>
+          <ul id="modelist">
+              <li class="checked"><input type="radio" name="security" id="nothing" value="nothing" /><label for="nothing">ReadOnly</label></li>
+              <li><input type="radio" name="security" id="ssh" value="SSH" checked /><label for="ssh">SSH Mode</label></li>
+              <li style="border-bottom:none"><input type="radio" name="security" id="https" value="HTTPS" /><label for="https">Https Mode</label></li>
+          </ul>
       </div>
       <div class="clear"></div><br/>
 <!--Fin tab1-->

slapos/runner/utils.py

@@ -19,6 +19,8 @@ from flask import jsonify
 
 import slapos.slap
 
+# Global variable
+global_software_type = 'default'
 
 # Setup default flask (werkzeug) parser
 
@@ -105,8 +107,9 @@ def requestInstance(config, software_type=None):
   """
   Request the main instance of our environment
   """
-  if not software_type:
-    software_type = None
+  if software_type:
+    global global_software_type
+    global_software_type = software_type
 
   slap = slapos.slap.slap()
   profile = getCurrentSoftwareReleaseProfile(config)
@@ -122,7 +125,7 @@ def requestInstance(config, software_type=None):
       profile,
       partition_reference=getSoftwareReleaseName(config),
       partition_parameter_kw=partition_parameter_kw,
-      software_type=software_type,
+      software_type=global_software_type,
       filter_kw=None,
       state=None,
       shared=False)