SDK/toaster.do
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Copy over the blenddir when adding a job.

Browse Source
This commit is contained in:
parazyd
2018-10-08 14:12:42 +02:00
parent a26432d665
commit c216f578ce
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jenkins_backend/sync_jobs.py
View File

@@ -20,7 +20,8 @@ def add_job(jobname):
desc = 'WebSDK build for: %s\nStarted: %s' % (info[0], info[2]) desc = 'WebSDK build for: %s\nStarted: %s' % (info[0], info[2])
sdk = info[1].split('_')[0] sdk = info[1].split('_')[0]
arch = info[1].split('_')[1] arch = info[1].split('_')[1]
blendfile = '%s/%s/Dockerfile' % (jobpath, jobname) blenddir = join(jobpath, jobname)
blendfile = join(blenddir, 'Dockerfile')
if sdk == 'arm': if sdk == 'arm':
board = info[1].split('_')[2] board = info[1].split('_')[2]
@@ -36,7 +37,8 @@ def add_job(jobname):
replacements = [('DESC', desc), replacements = [('DESC', desc),
('SDK', sdk), ('SDK', sdk),
('ARCH', arch), ('ARCH', arch),
('COMMAND', command)] ('COMMAND', command),
('BLENDDIR', blenddir)]
sdk_job = open(join(pypath, 'toasterbuild.xml'), encoding='utf-8').read() sdk_job = open(join(pypath, 'toasterbuild.xml'), encoding='utf-8').read()

1
jenkins_backend/toasterbuild.xml
View File

@@ -34,6 +34,7 @@
<builders> <builders>
<hudson.tasks.Shell> <hudson.tasks.Shell>
<command> <command>
scp -r sdk:{{{BLENDDIR}}} {{{BLENDDIR}}}
git submodule update --init --recursive --checkout git submodule update --init --recursive --checkout
{{{COMMAND}}} {{{COMMAND}}}
</command> </command>