From c7167cf9b6d5f27459f74f0573e9717b8a6713d5 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Fri, 4 Mar 2016 17:38:30 +0100
Subject: [PATCH] Convert infra* jobs to ubuntu-trusty

Convert infra* jobs that explicitely set bare-trusty to use
ubuntu-trusty.

Change-Id: Iad060e88d81fc1f73a65f38e5dbf251426c07fa7
---
 jenkins/jobs/infra-publications.yaml | 10 ++++++----
 jenkins/jobs/infra-publish-jobs.yaml |  8 +++++---
 jenkins/jobs/infra.yaml              | 15 +++++++++------
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/jenkins/jobs/infra-publications.yaml b/jenkins/jobs/infra-publications.yaml
index 8b60d56f88..7cfc9b0a69 100644
--- a/jenkins/jobs/infra-publications.yaml
+++ b/jenkins/jobs/infra-publications.yaml
@@ -1,11 +1,12 @@
 # simply copy the contents of the repository to the server, no building needed
 - job:
     name: infra-publications-publish
-    node: bare-trusty
+    node: ubuntu-trusty
 
     builders:
-      - revoke-sudo
       - gerrit-git-prep
+      - install-distro-packages
+      - revoke-sudo
       - shell: |
           #!/bin/bash -x
           # NAME will either be the branch name or the tag name
@@ -28,11 +29,12 @@
 
 - job:
     name: infra-publications-publish-index
-    node: bare-trusty
+    node: ubuntu-trusty
 
     builders:
-      - revoke-sudo
       - gerrit-git-prep
+      - install-distro-packages
+      - revoke-sudo
       - shell: |
           #!/bin/bash -xe
           git reset --hard remotes/origin/master
diff --git a/jenkins/jobs/infra-publish-jobs.yaml b/jenkins/jobs/infra-publish-jobs.yaml
index e28e3ab058..a5468f5b71 100644
--- a/jenkins/jobs/infra-publish-jobs.yaml
+++ b/jenkins/jobs/infra-publish-jobs.yaml
@@ -21,11 +21,12 @@
 - job:
     name: publish-infra-docs-index
     description: Render and publish the infra docs index.
-    node: bare-trusty
+    node: ubuntu-trusty
 
     builders:
-      - revoke-sudo
       - gerrit-git-prep
+      - install-distro-packages
+      - revoke-sudo
       - tox:
           envlist: infra-docs
 
@@ -43,8 +44,9 @@
     node: bare-trusty
 
     builders:
-      - revoke-sudo
       - gerrit-git-prep
+      - install-distro-packages
+      - revoke-sudo
       - tox:
           envlist: infra-docs
 
diff --git a/jenkins/jobs/infra.yaml b/jenkins/jobs/infra.yaml
index 45872de504..7d2a55a402 100644
--- a/jenkins/jobs/infra.yaml
+++ b/jenkins/jobs/infra.yaml
@@ -209,11 +209,12 @@
 
 - job:
     name: irc-meetings-publish
-    node: bare-trusty
+    node: ubuntu-trusty
 
     builders:
-      - revoke-sudo
       - gerrit-git-prep
+      - install-distro-packages
+      - revoke-sudo
       - tox:
           envlist: 'ical'
 
@@ -241,11 +242,12 @@
 
 - job:
     name: gate-irc-meetings-tox-ical
-    node: bare-trusty
+    node: ubuntu-trusty
 
     builders:
-      - revoke-sudo
       - gerrit-git-prep
+      - install-distro-packages
+      - revoke-sudo
       - tox:
           envlist: 'ical,check'
 
@@ -268,11 +270,12 @@
 
 - job:
     name: gate-infra-ansible
-    node: bare-trusty
+    node: ubuntu-trusty
 
     builders:
-      - revoke-sudo
       - gerrit-git-prep
+      - install-distro-packages
+      - revoke-sudo
       - tox:
           envlist: 'ansible-syntax-check'