Merge jenkaas-jobs:add-debhelper-and-custom-install into jenkaas-jobs:master

[Michał Sawicz]

Add debhelper and allow specifying a custom set of additional packages

[Olivier Tilloy (osomon)]

LGTM, thanks!

review: Approve

[Olivier Tilloy (osomon)]

Tested the addition of debhelper, works fine.
Not tested install_packages yet, will do asap.

[Olivier Tilloy (osomon)]

Tested install_packages, works as expected.

review: Approve

diff --git a/jenkaas_jobs/yaml/prepare/prepare-0-install.sh b/jenkaas_jobs/yaml/prepare/prepare-0-install.sh
index cc06eb5..3fb302a 100644
--- a/jenkaas_jobs/yaml/prepare/prepare-0-install.sh
+++ b/jenkaas_jobs/yaml/prepare/prepare-0-install.sh
@@ -22,6 +22,7 @@ sudo apt update
 # autopkgtest to run autopkgtests
 # bzr-builddeb for building source packages
 # ccache to prepare the shared ccache dir
+# debhelper for debian/rules clean
 # debootstrap to create the chroots
 # fakeroot needed by package builds
 # python3 modules for python-based steps
@@ -33,6 +34,7 @@ sudo apt-get install --yes \
   autopkgtest/trusty-backports \
   bzr-builddeb \
   ccache \
+  debhelper \
   debootstrap \
   fakeroot \
   python3-requests \
@@ -40,6 +42,7 @@ sudo apt-get install --yes \
   schroot \
   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 6e23c24..42c6d1f 100644
--- a/jenkaas_jobs/yaml/prepare/prepare-0-install.yaml
+++ b/jenkaas_jobs/yaml/prepare/prepare-0-install.yaml
@@ -1,7 +1,8 @@
 - job-template:
     name: prepare-0-install
+    install_packages: ''
     # NOTE: make sure to bump this whenever this job is updated
-    job_version: 10
+    job_version: 11
     project-type: matrix
     description: |
       This job adds all the needed repositories and installs dependencies needed
diff --git a/project-example.yaml b/project-example.yaml
index 09b8817..dceb47a 100644
--- a/project-example.yaml
+++ b/project-example.yaml
@@ -27,7 +27,12 @@
     # This needs to be a comma-separated list of quoted LP teams and/or users.
     allowed_users: | 
         "your-ci-team", "someone-else"
-    
+
+    # A space-separated list of packages to install on build slaves in addition
+    # to the default list. Use this if, for example, your debian/rules clean
+    # target needs something specific.
+    install_packages: ''
+
     # The list of all slaves available in your jenkins instance. Currently only
     # the run-commands job uses that list.
     all_slaves:
diff --git a/tests/fixtures/prepare/prepare-0-install.xml b/tests/fixtures/prepare/prepare-0-install.xml
index ff3d50b..7620360 100644
--- a/tests/fixtures/prepare/prepare-0-install.xml
+++ b/tests/fixtures/prepare/prepare-0-install.xml
@@ -47,7 +47,7 @@ on build slaves.
     <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-v10</file>
+          <file>steps/0-install-v11</file>
           <baseDir class="org.jenkins_ci.plugins.run_condition.common.BaseDirectory$Workspace"/>
         </condition>
       </condition>
@@ -76,6 +76,7 @@ sudo apt update
 # autopkgtest to run autopkgtests
 # bzr-builddeb for building source packages
 # ccache to prepare the shared ccache dir
+# debhelper for debian/rules clean
 # debootstrap to create the chroots
 # fakeroot needed by package builds
 # python3 modules for python-based steps
@@ -87,6 +88,7 @@ sudo apt-get install --yes \
   autopkgtest/trusty-backports \
   bzr-builddeb \
   ccache \
+  debhelper \
   debootstrap \
   fakeroot \
   python3-requests \
@@ -94,9 +96,10 @@ sudo apt-get install --yes \
   schroot \
   ubuntu-dev-tools \
   unzip \
+  additional-package
 
 mkdir -p steps
-touch steps/0-install-v10
+touch steps/0-install-v11
 </command>
       </buildStep>
       <runner class="org.jenkins_ci.plugins.run_condition.BuildStepRunner$Fail" plugin="run-condition@1.0"/>
@@ -106,7 +109,7 @@ touch steps/0-install-v10
   <buildWrappers>
     <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.7.2"/>
     <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
-      <template>v10</template>
+      <template>v11</template>
     </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
   </buildWrappers>
   <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
diff --git a/tests/project.yaml b/tests/project.yaml
index 72458fb..d0892af 100644
--- a/tests/project.yaml
+++ b/tests/project.yaml
@@ -4,6 +4,7 @@
     bot_username: test-ci-bot
     bot_email: Test CI Bot <[e-mail]>
     allowed_users: '"test-ci-team"'
+    install_packages: additional-package
     all_slaves:
     - jenkins-slave-2
     - cyclops-node02