Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.toolbox
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Eric Zheng
slapos.toolbox
Commits
71c23e94
Commit
71c23e94
authored
Sep 17, 2013
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
the auto-deployment is made in a new thread, so it doesn't block the server
parent
c8ab1273
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
slapos/runner/utils.py
slapos/runner/utils.py
+6
-2
No files found.
slapos/runner/utils.py
View file @
71c23e94
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
import
logging
import
logging
import
md5
import
md5
import
multiprocessing
import
multiprocessing
import
thread
import
re
import
re
import
shutil
import
shutil
import
os
import
os
...
@@ -817,6 +818,10 @@ def cloneDefaultGit(config):
...
@@ -817,6 +818,10 @@ def cloneDefaultGit(config):
}
}
cloneRepo(data)
cloneRepo(data)
def buildAndRun(config):
runSoftwareWithLock(config)
runInstanceWithLock(config)
def setupDefaultSR(config):
def setupDefaultSR(config):
"""If a default_sr is in the parameters,
"""If a default_sr is in the parameters,
and no SR is deployed yet, setup it
and no SR is deployed yet, setup it
...
@@ -825,5 +830,4 @@ def setupDefaultSR(config):
...
@@ -825,5 +830,4 @@ def setupDefaultSR(config):
if not os.path.exists(project) and config['
default_sr
'] != '':
if not os.path.exists(project) and config['
default_sr
'] != '':
configNewSR(config, config['
default_sr
'])
configNewSR(config, config['
default_sr
'])
if config['
auto_deploy
']:
if config['
auto_deploy
']:
runSoftwareWithLock(config)
thread.start_new_thread(buildAndRun, (config,))
runInstanceWithLock(config)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment