Merge ~saviq/jenkaas-jobs:drop-prepare-steps into jenkaas-jobs:master

[Michał Sawicz]

The run conditions only really made things more confusing. (LP#1566860)

[Olivier Tilloy (osomon)]

Looks good to me. Not actually tested but the changes are sound. Only one minor comment inline.

review: Approve

diff --git a/jenkaas_jobs/yaml/maintain/maintain-8-delete-chroots.sh b/jenkaas_jobs/yaml/maintain/maintain-8-delete-chroots.sh
index c510d57..1e6c17f 100644
--- a/jenkaas_jobs/yaml/maintain/maintain-8-delete-chroots.sh
+++ b/jenkaas_jobs/yaml/maintain/maintain-8-delete-chroots.sh
@@ -3,7 +3,16 @@
 # log all commands and abort on error
 set -xe
 
-# delete step, chroot definition and chroot itself
-sudo rm -Rf steps/2-chroot-v*-$release-$arch \
-            /etc/schroot/chroot.d/sbuild-$release*-$arch \
-            /var/lib/schroot/chroots/$release*-$arch
+# extract target arch
+TARGET_ARCH=${arch##*-}
+
+# non-native architectures have a build arch prefix
+if [[ ${arch} = cross-* ]]; then
+  NAME="${release}-$(dpkg-architecture -qDEB_BUILD_ARCH)-${TARGET_ARCH}"
+else
+  NAME="${release}-${TARGET_ARCH}"
+fi
+
+# delete chroot definition and chroot itself
+sudo rm -Rf /etc/schroot/chroot.d/sbuild-${NAME} \
+            /var/lib/schroot/chroots/${NAME}
diff --git a/jenkaas_jobs/yaml/maintain/maintain-8-delete-chroots.yaml b/jenkaas_jobs/yaml/maintain/maintain-8-delete-chroots.yaml
index 39f867d..ce307b9 100644
--- a/jenkaas_jobs/yaml/maintain/maintain-8-delete-chroots.yaml
+++ b/jenkaas_jobs/yaml/maintain/maintain-8-delete-chroots.yaml
@@ -2,8 +2,6 @@
     name: maintain-8-delete-chroots
     project-type: matrix
     description: 'Delete selected chroots.'
-    workspace: ${{JENKINS_HOME}}/prepare
-    child-workspace: .
     node: monitor
     properties:
     - build-discarder:
diff --git a/jenkaas_jobs/yaml/maintain/maintain-9-reset.yaml b/jenkaas_jobs/yaml/maintain/maintain-9-reset.yaml
deleted file mode 100644
index 65cd45f..0000000
--- a/jenkaas_jobs/yaml/maintain/maintain-9-reset.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-- job-template:
-    name: maintain-9-reset
-    project-type: matrix
-    description: 'Reset the prepare steps on slaves to force full preparation of a slave.'
-    workspace: ${{JENKINS_HOME}}/prepare
-    child-workspace: .
-    node: monitor
-    properties:
-    - build-discarder:
-        num-to-keep: 10
-    - rebuild
-    parameters:
-    - matrix-combinations:
-        name: configurations
-        description: 'Which nodes to reset'
-        filter: 'false'
-    axes:
-    - axis:
-        type: slave
-        name: node
-        values: '{obj:build_slaves}'
-    wrappers:
-    - timestamps
-    - workspace-cleanup:
-        include:
-        - steps/*
diff --git a/jenkaas_jobs/yaml/prepare/prepare-0-install.sh b/jenkaas_jobs/yaml/prepare/prepare-0-install.sh
index 3fb302a..24a2294 100644
--- a/jenkaas_jobs/yaml/prepare/prepare-0-install.sh
+++ b/jenkaas_jobs/yaml/prepare/prepare-0-install.sh
@@ -43,6 +43,3 @@ sudo apt-get install --yes \
   ubuntu-dev-tools \
   unzip \
   {install_packages}
-
-mkdir -p steps
-touch steps/0-install-v{job_version}
diff --git a/jenkaas_jobs/yaml/prepare/prepare-0-install.yaml b/jenkaas_jobs/yaml/prepare/prepare-0-install.yaml
index 2b88570..9d76273 100644
--- a/jenkaas_jobs/yaml/prepare/prepare-0-install.yaml
+++ b/jenkaas_jobs/yaml/prepare/prepare-0-install.yaml
@@ -1,14 +1,10 @@
 - job-template:
     name: prepare-0-install
     install_packages: ''
-    # NOTE: make sure to bump this whenever this job is updated
-    job_version: 11
     project-type: matrix
     description: |
       This job adds all the needed repositories and installs dependencies needed
       on build slaves.
-    workspace: ${{JENKINS_HOME}}/prepare
-    child-workspace: .
     node: monitor
     properties:
     - build-discarder:
@@ -25,11 +21,6 @@
         values: '{obj:build_slaves}'
     wrappers:
     - timestamps
-    - build-name:
-        name: v{job_version}
     builders:
-    - prepare_condition:
-        prepare_step: 0-install-v{job_version}
-        prepare_steps:
-        - shell:
-            !include-raw: prepare-0-install.sh
+    - shell:
+        !include-raw: prepare-0-install.sh
diff --git a/jenkaas_jobs/yaml/prepare/prepare-1-sbuild.sh b/jenkaas_jobs/yaml/prepare/prepare-1-sbuild.sh
index 36dc551..2c9bb1c 100644
--- a/jenkaas_jobs/yaml/prepare/prepare-1-sbuild.sh
+++ b/jenkaas_jobs/yaml/prepare/prepare-1-sbuild.sh
@@ -45,8 +45,4 @@ export PATH="/usr/lib/ccache:$PATH"
 exec "\$@"
 EOF
   sudo chmod +x $ccdir/sbuild-setup
-
-  # store status
-  mkdir -p steps
-  touch steps/1-sbuild-v{job_version}
 fi
\ No newline at end of file
diff --git a/jenkaas_jobs/yaml/prepare/prepare-1-sbuild.yaml b/jenkaas_jobs/yaml/prepare/prepare-1-sbuild.yaml
index 0dd1e08..5b9bc11 100644
--- a/jenkaas_jobs/yaml/prepare/prepare-1-sbuild.yaml
+++ b/jenkaas_jobs/yaml/prepare/prepare-1-sbuild.yaml
@@ -1,15 +1,11 @@
 - job-template:
     name: prepare-1-sbuild
-    # NOTE: make sure to bump this whenever this job is updated
-    job_version: 4
     project-type: matrix
     description: |
       This job prepares the sbuild environment as required.
 
       NOTE: It might be needed for slaves to be restarted, in which case
       the job will fail and needs to be ran again.
-    workspace: ${{JENKINS_HOME}}/prepare
-    child-workspace: .
     node: monitor
     properties:
     - build-discarder:
@@ -34,14 +30,9 @@
         values: '{obj:build_slaves}'
     wrappers:
     - timestamps
-    - build-name:
-        name: v{job_version}
     builders:
-    - prepare_condition:
-        prepare_step: 1-sbuild-v{job_version}
-        prepare_steps:
-        - shell:
-            !include-raw: prepare-1-sbuild.sh
+    - shell:
+        !include-raw: prepare-1-sbuild.sh
     publishers:
     - description_setter:
         set_for_matrix: 'true'
\ No newline at end of file
diff --git a/jenkaas_jobs/yaml/prepare/prepare-2-chroots.sh b/jenkaas_jobs/yaml/prepare/prepare-2-chroots.sh
index 557498c..ce5e080 100644
--- a/jenkaas_jobs/yaml/prepare/prepare-2-chroots.sh
+++ b/jenkaas_jobs/yaml/prepare/prepare-2-chroots.sh
@@ -6,7 +6,7 @@ set -xe
 # extract target arch
 TARGET_ARCH=${{arch##*-}}
 
-# users and groups that can access the new chroots
+# users and groups that can access the chroots
 export SCHROOT_CONF_SUFFIX="source-root-users=root,sbuild
 source-root-groups=root,sbuild
 command-prefix=/var/cache/ccache-sbuild/sbuild-setup"
@@ -23,21 +23,21 @@ else
   NAME="${{release}}-${{TARGET_ARCH}}"
 fi
 
-# remove any old matching chroots
-sudo rm -Rf /etc/schroot/chroot.d/sbuild-${{NAME}} /var/lib/schroot/chroots/${{NAME}}
+# only proceed if the chroot is not defined already
+if [ ! -e /etc/schroot/chroot.d/sbuild-${{NAME}} ]; then
 
-# build the chroot
-mk-sbuild --name=${{release}} ${{ARGS}} ${{release%%+*}}
+  # remove any stale chroots
+  sudo rm -Rf /var/lib/schroot/chroots/${{NAME}}
 
-# add the overlay PPA
-if [[ ${{release}} = *+overlay ]]; then
-  schroot --chroot source:${{NAME}} --user root --directory /root -- \
-    apt-add-repository --yes --enable-source ppa:ci-train-ppa-service/stable-phone-overlay
-fi
+  # build the chroot
+  mk-sbuild --name=${{release}} ${{ARGS}} ${{release%%+*}}
 
-# upgrade packages
-sbuild-update --update --dist-upgrade --clean --autoclean --autoremove ${{NAME}}
+  # add the overlay PPA
+  if [[ ${{release}} = *+overlay ]]; then
+    schroot --chroot source:${{NAME}} --user root --directory /root -- \
+      apt-add-repository --yes --enable-source ppa:ci-train-ppa-service/stable-phone-overlay
+  fi
 
-# store status
-mkdir -p steps
-touch steps/2-chroot-v{job_version}-${{release}}-${{arch}}
\ No newline at end of file
+  # upgrade packages
+  sbuild-update --update --dist-upgrade --clean --autoclean --autoremove ${{NAME}}
+fi
\ No newline at end of file
diff --git a/jenkaas_jobs/yaml/prepare/prepare-2-chroots.yaml b/jenkaas_jobs/yaml/prepare/prepare-2-chroots.yaml
index eee0604..03bd191 100644
--- a/jenkaas_jobs/yaml/prepare/prepare-2-chroots.yaml
+++ b/jenkaas_jobs/yaml/prepare/prepare-2-chroots.yaml
@@ -1,11 +1,7 @@
 - job-template:
     name: prepare-2-chroots
-    # NOTE: make sure to bump this whenever this job is updated
-    job_version: 4
     project-type: matrix
     description: This job builds a set of chroots for all the supported architectures and releases
-    workspace: ${{JENKINS_HOME}}/prepare
-    child-workspace: .
     node: monitor
     properties:
     - build-discarder:
@@ -31,11 +27,6 @@
         values: '{obj:build_slaves}'
     wrappers:
     - timestamps
-    - build-name:
-        name: v{job_version}
     builders:
-    - prepare_condition:
-        prepare_step: 2-chroot-v{job_version}-${{release}}-${{arch}}
-        prepare_steps:
-        - shell:
-            !include-raw: prepare-2-chroots.sh
\ No newline at end of file
+    - shell:
+        !include-raw: prepare-2-chroots.sh
\ No newline at end of file
diff --git a/tests/fixtures/maintain/maintain-8-delete-chroots.xml b/tests/fixtures/maintain/maintain-8-delete-chroots.xml
index cbafb4f..94bc00f 100644
--- a/tests/fixtures/maintain/maintain-8-delete-chroots.xml
+++ b/tests/fixtures/maintain/maintain-8-delete-chroots.xml
@@ -34,7 +34,6 @@
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers/>
   <concurrentBuild>false</concurrentBuild>
-  <customWorkspace>${JENKINS_HOME}/prepare</customWorkspace>
   <axes>
     <hudson.matrix.TextAxis>
       <name>release</name>
@@ -66,10 +65,19 @@
 # log all commands and abort on error
 set -xe
 
-# delete step, chroot definition and chroot itself
-sudo rm -Rf steps/2-chroot-v*-$release-$arch \
-            /etc/schroot/chroot.d/sbuild-$release*-$arch \
-            /var/lib/schroot/chroots/$release*-$arch
+# extract target arch
+TARGET_ARCH=${arch##*-}
+
+# non-native architectures have a build arch prefix
+if [[ ${arch} = cross-* ]]; then
+  NAME="${release}-$(dpkg-architecture -qDEB_BUILD_ARCH)-${TARGET_ARCH}"
+else
+  NAME="${release}-${TARGET_ARCH}"
+fi
+
+# delete chroot definition and chroot itself
+sudo rm -Rf /etc/schroot/chroot.d/sbuild-${NAME} \
+            /var/lib/schroot/chroots/${NAME}
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -80,5 +88,4 @@ sudo rm -Rf steps/2-chroot-v*-$release-$arch \
   <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
     <runSequentially>false</runSequentially>
   </executionStrategy>
-  <childCustomWorkspace>.</childCustomWorkspace>
 </matrix-project>
\ No newline at end of file
diff --git a/tests/fixtures/maintain/maintain-9-reset.xml b/tests/fixtures/maintain/maintain-9-reset.xml
deleted file mode 100644
index 32f7a22..0000000
--- a/tests/fixtures/maintain/maintain-9-reset.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<matrix-project plugin="matrix-project@1.4.1">
-  <actions/>
-  <description>Reset the prepare steps on slaves to force full preparation of a slave.&lt;!-- Managed by Jenkins Job Builder --&gt;</description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy>
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>10</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>-1</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.plugins.matrix__configuration__parameter.MatrixCombinationsParameterDefinition plugin="matrix-combinations-parameter@1.0.9">
-          <name>configurations</name>
-          <description>Which nodes to reset</description>
-          <defaultCombinationFilter>false</defaultCombinationFilter>
-        </hudson.plugins.matrix__configuration__parameter.MatrixCombinationsParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.25">
-      <autoRebuild>false</autoRebuild>
-      <rebuildDisabled>false</rebuildDisabled>
-    </com.sonyericsson.rebuild.RebuildSettings>
-  </properties>
-  <customWorkspace>${JENKINS_HOME}/prepare</customWorkspace>
-  <scm class="hudson.scm.NullSCM"/>
-  <assignedNode>monitor</assignedNode>
-  <canRoam>false</canRoam>
-  <disabled>false</disabled>
-  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
-  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
-  <triggers/>
-  <concurrentBuild>false</concurrentBuild>
-  <axes>
-    <hudson.matrix.LabelAxis>
-      <name>node</name>
-      <values>
-        <string>jenkins-slave-2</string>
-        <string>cyclops-node02</string>
-      </values>
-    </hudson.matrix.LabelAxis>
-  </axes>
-  <builders/>
-  <publishers/>
-  <buildWrappers>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.7.2"/>
-    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.28">
-      <patterns>
-        <hudson.plugins.ws__cleanup.Pattern>
-          <pattern>steps/*</pattern>
-          <type>INCLUDE</type>
-        </hudson.plugins.ws__cleanup.Pattern>
-      </patterns>
-      <deleteDirs>false</deleteDirs>
-      <cleanupParameter></cleanupParameter>
-      <externalDelete></externalDelete>
-    </hudson.plugins.ws__cleanup.PreBuildCleanup>
-  </buildWrappers>
-  <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
-    <runSequentially>false</runSequentially>
-  </executionStrategy>
-  <childCustomWorkspace>.</childCustomWorkspace>
-</matrix-project>
diff --git a/tests/fixtures/prepare/prepare-0-install.xml b/tests/fixtures/prepare/prepare-0-install.xml
index b568ccf..dc191e8 100644
--- a/tests/fixtures/prepare/prepare-0-install.xml
+++ b/tests/fixtures/prepare/prepare-0-install.xml
@@ -35,7 +35,6 @@ on build slaves.
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers/>
   <concurrentBuild>false</concurrentBuild>
-  <customWorkspace>${JENKINS_HOME}/prepare</customWorkspace>
   <axes>
     <hudson.matrix.LabelAxis>
       <name>node</name>
@@ -46,15 +45,8 @@ on build slaves.
     </hudson.matrix.LabelAxis>
   </axes>
   <builders>
-    <org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder plugin="conditional-buildstep@1.3.3">
-      <condition class="org.jenkins_ci.plugins.run_condition.logic.Not" plugin="run-condition@1.0">
-        <condition class="org.jenkins_ci.plugins.run_condition.core.FileExistsCondition">
-          <file>steps/0-install-v11</file>
-          <baseDir class="org.jenkins_ci.plugins.run_condition.common.BaseDirectory$Workspace"/>
-        </condition>
-      </condition>
-      <buildStep class="hudson.tasks.Shell">
-        <command>#!/bin/bash
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash
 
 # log all commands and abort on error
 set -ex
@@ -99,23 +91,14 @@ sudo apt-get install --yes \
   ubuntu-dev-tools \
   unzip \
   additional-package
-
-mkdir -p steps
-touch steps/0-install-v11
 </command>
-      </buildStep>
-      <runner class="org.jenkins_ci.plugins.run_condition.BuildStepRunner$Fail" plugin="run-condition@1.0"/>
-    </org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder>
+    </hudson.tasks.Shell>
   </builders>
   <publishers/>
   <buildWrappers>
     <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.7.2"/>
-    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
-      <template>v11</template>
-    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
   </buildWrappers>
   <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
     <runSequentially>false</runSequentially>
   </executionStrategy>
-  <childCustomWorkspace>.</childCustomWorkspace>
 </matrix-project>
diff --git a/tests/fixtures/prepare/prepare-1-sbuild.xml b/tests/fixtures/prepare/prepare-1-sbuild.xml
index c1c9133..7b22769 100644
--- a/tests/fixtures/prepare/prepare-1-sbuild.xml
+++ b/tests/fixtures/prepare/prepare-1-sbuild.xml
@@ -47,7 +47,6 @@ It will be removed from the workspace after consuming.
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers/>
   <concurrentBuild>false</concurrentBuild>
-  <customWorkspace>${JENKINS_HOME}/prepare</customWorkspace>
   <axes>
     <hudson.matrix.LabelAxis>
       <name>node</name>
@@ -58,15 +57,8 @@ It will be removed from the workspace after consuming.
     </hudson.matrix.LabelAxis>
   </axes>
   <builders>
-    <org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder plugin="conditional-buildstep@1.3.3">
-      <condition class="org.jenkins_ci.plugins.run_condition.logic.Not" plugin="run-condition@1.0">
-        <condition class="org.jenkins_ci.plugins.run_condition.core.FileExistsCondition">
-          <file>steps/1-sbuild-v4</file>
-          <baseDir class="org.jenkins_ci.plugins.run_condition.common.BaseDirectory$Workspace"/>
-        </condition>
-      </condition>
-      <buildStep class="hudson.tasks.Shell">
-        <command>#!/bin/bash
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash
 
 # log all commands and abort on error
 set -ex
@@ -113,14 +105,8 @@ export PATH=&quot;/usr/lib/ccache:$PATH&quot;
 exec &quot;\$@&quot;
 EOF
   sudo chmod +x $ccdir/sbuild-setup
-
-  # store status
-  mkdir -p steps
-  touch steps/1-sbuild-v4
 fi</command>
-      </buildStep>
-      <runner class="org.jenkins_ci.plugins.run_condition.BuildStepRunner$Fail" plugin="run-condition@1.0"/>
-    </org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder>
+    </hudson.tasks.Shell>
   </builders>
   <publishers>
     <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.10">
@@ -131,12 +117,8 @@ fi</command>
   </publishers>
   <buildWrappers>
     <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.7.2"/>
-    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
-      <template>v4</template>
-    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
   </buildWrappers>
   <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
     <runSequentially>false</runSequentially>
   </executionStrategy>
-  <childCustomWorkspace>.</childCustomWorkspace>
 </matrix-project>
diff --git a/tests/fixtures/prepare/prepare-2-chroots.xml b/tests/fixtures/prepare/prepare-2-chroots.xml
index 251c922..36ea4fd 100644
--- a/tests/fixtures/prepare/prepare-2-chroots.xml
+++ b/tests/fixtures/prepare/prepare-2-chroots.xml
@@ -34,7 +34,6 @@
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers/>
   <concurrentBuild>false</concurrentBuild>
-  <customWorkspace>${JENKINS_HOME}/prepare</customWorkspace>
   <axes>
     <hudson.matrix.TextAxis>
       <name>release</name>
@@ -60,15 +59,8 @@
     </hudson.matrix.LabelAxis>
   </axes>
   <builders>
-    <org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder plugin="conditional-buildstep@1.3.3">
-      <condition class="org.jenkins_ci.plugins.run_condition.logic.Not" plugin="run-condition@1.0">
-        <condition class="org.jenkins_ci.plugins.run_condition.core.FileExistsCondition">
-          <file>steps/2-chroot-v4-${release}-${arch}</file>
-          <baseDir class="org.jenkins_ci.plugins.run_condition.common.BaseDirectory$Workspace"/>
-        </condition>
-      </condition>
-      <buildStep class="hudson.tasks.Shell">
-        <command>#!/bin/bash
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash
 
 # log all commands and abort on error
 set -xe
@@ -76,7 +68,7 @@ set -xe
 # extract target arch
 TARGET_ARCH=${arch##*-}
 
-# users and groups that can access the new chroots
+# users and groups that can access the chroots
 export SCHROOT_CONF_SUFFIX=&quot;source-root-users=root,sbuild
 source-root-groups=root,sbuild
 command-prefix=/var/cache/ccache-sbuild/sbuild-setup&quot;
@@ -93,37 +85,31 @@ else
   NAME=&quot;${release}-${TARGET_ARCH}&quot;
 fi
 
-# remove any old matching chroots
-sudo rm -Rf /etc/schroot/chroot.d/sbuild-${NAME} /var/lib/schroot/chroots/${NAME}
+# only proceed if the chroot is not defined already
+if [ ! -e /etc/schroot/chroot.d/sbuild-${NAME} ]; then
 
-# build the chroot
-mk-sbuild --name=${release} ${ARGS} ${release%%+*}
+  # remove any stale chroots
+  sudo rm -Rf /var/lib/schroot/chroots/${NAME}
 
-# add the overlay PPA
-if [[ ${release} = *+overlay ]]; then
-  schroot --chroot source:${NAME} --user root --directory /root -- \
-    apt-add-repository --yes --enable-source ppa:ci-train-ppa-service/stable-phone-overlay
-fi
+  # build the chroot
+  mk-sbuild --name=${release} ${ARGS} ${release%%+*}
 
-# upgrade packages
-sbuild-update --update --dist-upgrade --clean --autoclean --autoremove ${NAME}
+  # add the overlay PPA
+  if [[ ${release} = *+overlay ]]; then
+    schroot --chroot source:${NAME} --user root --directory /root -- \
+      apt-add-repository --yes --enable-source ppa:ci-train-ppa-service/stable-phone-overlay
+  fi
 
-# store status
-mkdir -p steps
-touch steps/2-chroot-v4-${release}-${arch}</command>
-      </buildStep>
-      <runner class="org.jenkins_ci.plugins.run_condition.BuildStepRunner$Run" plugin="run-condition@1.0"/>
-    </org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder>
+  # upgrade packages
+  sbuild-update --update --dist-upgrade --clean --autoclean --autoremove ${NAME}
+fi</command>
+    </hudson.tasks.Shell>
   </builders>
   <publishers/>
   <buildWrappers>
     <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.7.2"/>
-    <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
-      <template>v4</template>
-    </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
   </buildWrappers>
   <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
     <runSequentially>false</runSequentially>
   </executionStrategy>
-  <childCustomWorkspace>.</childCustomWorkspace>
 </matrix-project>