jenkins_backend/sync_jobs.py

@@ -25,13 +25,13 @@ def add_job(jobname):
 
     if sdk == 'arm':
         board = info[1].split('_')[2]
-        zshcmd = 'load devuan %s %s && build_image_dist' % (board, blendfile)
+        zshcmd = 'load devuan %s %s' % (board, blendfile)
     elif sdk == 'live':
-        zshcmd = 'load devuan %s %s && build_iso_dist ' % (arch, blendfile)
+        zshcmd = 'load devuan %s %s' % (arch, blendfile)
     elif sdk == 'vm':
-        zshcmd = 'load devuan %s && build_vagrant_dist' % (blendfile)
+        zshcmd = 'load devuan %s' % (blendfile)
 
-    command = "zsh -f -c 'source sdk && %s'" % zshcmd
+    command = "zsh -f -c 'source sdk && %s && build_image_dist'" % zshcmd
     command = html.escape(command)
 
     replacements = [('DESC', desc),

jenkins_backend/toasterbuild.xml

@@ -34,10 +34,9 @@
   <builders>
     <hudson.tasks.Shell>
       <command>
-scp -r sdk:{{{BLENDDIR}}} {{{BLENDDIR}}} || exit 1
-git submodule update --init --recursive --checkout || exit 1
-{{{COMMAND}}} || exit 1
-rm -rf {{{BLENDDIR}}}
+scp -r sdk:{{{BLENDDIR}}} {{{BLENDDIR}}}
+git submodule update --init --recursive --checkout
+{{{COMMAND}}}
       </command>
     </hudson.tasks.Shell>
   </builders>