Merge ~saviq/jenkaas-jobs:add-jenkaas-tools into jenkaas-jobs:master

[Michał Sawicz]

Add ppa:jenkaas-hackers/tools to slaves

We now need new sbuild, we'll probably need more tools as we go.

NOTE: you need to run the prepare-0-install and maintain-0-upgrade
jobs on all build slaves to make this change work.

[Olivier Tilloy (osomon)]

LGTM and tested on the system-apps jenkaas instance.

review: Approve

diff --git a/jenkaas_jobs/yaml/prepare/prepare-0-install.sh b/jenkaas_jobs/yaml/prepare/prepare-0-install.sh
index 24a2294..ba408c2 100644
--- a/jenkaas_jobs/yaml/prepare/prepare-0-install.sh
+++ b/jenkaas_jobs/yaml/prepare/prepare-0-install.sh
@@ -10,6 +10,8 @@ sudo apt-get install --yes \
 
 # build tools as used in Launchpad
 sudo add-apt-repository --yes ppa:launchpad/buildd-staging
+sudo add-apt-repository --yes ppa:jenkaas-hackers/tools
+
 # backported tools (e.g. autopkgtest)
 if [[ "amd64 i386" == *`dpkg-architecture -qDEB_HOST_ARCH`* ]]; then
   sudo add-apt-repository --yes "deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse"
diff --git a/jenkaas_jobs/yaml/prepare/prepare-1-sbuild.sh b/jenkaas_jobs/yaml/prepare/prepare-1-sbuild.sh
index 2c9bb1c..af68984 100644
--- a/jenkaas_jobs/yaml/prepare/prepare-1-sbuild.sh
+++ b/jenkaas_jobs/yaml/prepare/prepare-1-sbuild.sh
@@ -12,15 +12,8 @@ if ! ( id | fgrep -q '(sbuild)' ); then
   # need to restart jenkins-slave if jenkins isn't in sbuild group yet
   sudo initctl restart --no-wait jenkins-slave
 else
-  # copy the public key file
-  [ -f keys/sbuild-key.pub ] && sudo cp keys/sbuild-key.pub /var/lib/sbuild/apt-keys
-  [ -f keys/sbuild-key.sec ] && sudo mv keys/sbuild-key.sec /var/lib/sbuild/apt-keys
-
-  if ! [ -f /var/lib/sbuild/apt-keys/sbuild-key.pub -a -f /var/lib/sbuild/apt-keys/sbuild-key.sec ]; then
-    echo "ERROR: You need to upload the sbuild archive keypair"
-
-    exit 1
-  fi
+  # remove the keys, if any - new sbuild doesn't require them
+  sudo rm -Rf /var/lib/sbuild/apt-keys
 
   # prepare shared ccache directory
   ccdir=/var/cache/ccache-sbuild
diff --git a/jenkaas_jobs/yaml/prepare/prepare-1-sbuild.yaml b/jenkaas_jobs/yaml/prepare/prepare-1-sbuild.yaml
index 5b9bc11..d77a887 100644
--- a/jenkaas_jobs/yaml/prepare/prepare-1-sbuild.yaml
+++ b/jenkaas_jobs/yaml/prepare/prepare-1-sbuild.yaml
@@ -15,14 +15,6 @@
     - matrix-combinations:
         name: configurations
         description: Which slaves to run these steps on
-    - file:
-        name: keys/sbuild-key.pub
-        description: Public key file for sbuild's internal repository.
-    - file:
-        name: keys/sbuild-key.sec
-        description: |
-          Private key file for sbuild's internal repository.
-          It will be removed from the workspace after consuming.
     axes:
     - axis:
         type: slave
diff --git a/tests/fixtures/prepare/prepare-0-install.xml b/tests/fixtures/prepare/prepare-0-install.xml
index dc191e8..85fdb61 100644
--- a/tests/fixtures/prepare/prepare-0-install.xml
+++ b/tests/fixtures/prepare/prepare-0-install.xml
@@ -58,6 +58,8 @@ sudo apt-get install --yes \
 
 # build tools as used in Launchpad
 sudo add-apt-repository --yes ppa:launchpad/buildd-staging
+sudo add-apt-repository --yes ppa:jenkaas-hackers/tools
+
 # backported tools (e.g. autopkgtest)
 if [[ "amd64 i386" == *`dpkg-architecture -qDEB_HOST_ARCH`* ]]; then
   sudo add-apt-repository --yes "deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse"
diff --git a/tests/fixtures/prepare/prepare-1-sbuild.xml b/tests/fixtures/prepare/prepare-1-sbuild.xml
index 7b22769..cb5569d 100644
--- a/tests/fixtures/prepare/prepare-1-sbuild.xml
+++ b/tests/fixtures/prepare/prepare-1-sbuild.xml
@@ -26,16 +26,6 @@ the job will fail and needs to be ran again.
           <name>configurations</name>
           <description>Which slaves to run these steps on</description>
         </hudson.plugins.matrix__configuration__parameter.MatrixCombinationsParameterDefinition>
-        <hudson.model.FileParameterDefinition>
-          <name>keys/sbuild-key.pub</name>
-          <description>Public key file for sbuild&apos;s internal repository.</description>
-        </hudson.model.FileParameterDefinition>
-        <hudson.model.FileParameterDefinition>
-          <name>keys/sbuild-key.sec</name>
-          <description>Private key file for sbuild's internal repository.
-It will be removed from the workspace after consuming.
-</description>
-        </hudson.model.FileParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
   </properties>
@@ -72,15 +62,8 @@ if ! ( id | fgrep -q &apos;(sbuild)&apos; ); then
   # need to restart jenkins-slave if jenkins isn&apos;t in sbuild group yet
   sudo initctl restart --no-wait jenkins-slave
 else
-  # copy the public key file
-  [ -f keys/sbuild-key.pub ] &amp;&amp; sudo cp keys/sbuild-key.pub /var/lib/sbuild/apt-keys
-  [ -f keys/sbuild-key.sec ] &amp;&amp; sudo mv keys/sbuild-key.sec /var/lib/sbuild/apt-keys
-
-  if ! [ -f /var/lib/sbuild/apt-keys/sbuild-key.pub -a -f /var/lib/sbuild/apt-keys/sbuild-key.sec ]; then
-    echo &quot;ERROR: You need to upload the sbuild archive keypair&quot;
-
-    exit 1
-  fi
+  # remove the keys, if any - new sbuild doesn't require them
+  sudo rm -Rf /var/lib/sbuild/apt-keys
 
   # prepare shared ccache directory
   ccdir=/var/cache/ccache-sbuild