From c216f578cef3143b49d232aa889759fc69041578 Mon Sep 17 00:00:00 2001 From: parazyd Date: Mon, 8 Oct 2018 14:12:42 +0200 Subject: [PATCH] Copy over the blenddir when adding a job. --- jenkins_backend/sync_jobs.py | 6 ++++-- jenkins_backend/toasterbuild.xml | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/jenkins_backend/sync_jobs.py b/jenkins_backend/sync_jobs.py index 4fea3a4..51cb03e 100755 --- a/jenkins_backend/sync_jobs.py +++ b/jenkins_backend/sync_jobs.py @@ -20,7 +20,8 @@ def add_job(jobname): desc = 'WebSDK build for: %s\nStarted: %s' % (info[0], info[2]) sdk = info[1].split('_')[0] arch = info[1].split('_')[1] - blendfile = '%s/%s/Dockerfile' % (jobpath, jobname) + blenddir = join(jobpath, jobname) + blendfile = join(blenddir, 'Dockerfile') if sdk == 'arm': board = info[1].split('_')[2] @@ -36,7 +37,8 @@ def add_job(jobname): replacements = [('DESC', desc), ('SDK', sdk), ('ARCH', arch), - ('COMMAND', command)] + ('COMMAND', command), + ('BLENDDIR', blenddir)] sdk_job = open(join(pypath, 'toasterbuild.xml'), encoding='utf-8').read() diff --git a/jenkins_backend/toasterbuild.xml b/jenkins_backend/toasterbuild.xml index 9a6adcf..be6305c 100644 --- a/jenkins_backend/toasterbuild.xml +++ b/jenkins_backend/toasterbuild.xml @@ -34,6 +34,7 @@ +scp -r sdk:{{{BLENDDIR}}} {{{BLENDDIR}}} git submodule update --init --recursive --checkout {{{COMMAND}}}