From 40c54efd123dd3e06066fbc51da48d485fd13ad3 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Tue, 18 Mar 2014 16:08:18 +0000
Subject: [PATCH] Stop using Jenkins SCM plug-in

This depends on slave script support and should not be approved
until I86c77695d8c374c94932664026ab7a541686ae74 has a chance to
appear in all current nodepool images.

* macros.yaml: Add a branch-git-prep builder which passes a BRANCH
environment variable into the gerrit-git-prep.sh slave script.

* python-bitrot-jobs.yaml: Pass the {branch} parameter to the
branch-git-prep builder to specify the branch on which to run stable
bitrot jobs, instead of using the SCM plug-in.

* translation-jobs.yaml
* zuul.yaml: Pass master as the branch for the branch-git-prep
builder instead of using the SCM plug-in.

Change-Id: Ied8b4c111172b654cc90938221690651a5b458df
---
 .../jenkins_job_builder/config/macros.yaml    |  8 +++++++
 .../config/python-bitrot-jobs.yaml            | 24 +++++--------------
 .../config/translation-jobs.yaml              | 16 ++++---------
 .../jenkins_job_builder/config/zuul.yaml      |  8 ++-----
 4 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
index 2c66a282ee..79c6719b40 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -3,6 +3,14 @@
     builders:
       - shell: "/usr/local/jenkins/slave_scripts/gerrit-git-prep.sh https://review.openstack.org git://git.openstack.org"
 
+- builder:
+    name: branch-git-prep
+    builders:
+      - shell: |
+          #!/bin/bash
+          export BRANCH={branch}
+          /usr/local/jenkins/slave_scripts/gerrit-git-prep.sh https://review.openstack.org git://git.openstack.org
+
 - builder:
     name: revoke-sudo
     builders:
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml
index cef272f45a..97d982ec6b 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml
@@ -9,6 +9,8 @@
 
     builders:
       - revoke-sudo
+      - branch-git-prep:
+          branch: '{branch}'
       - python26:
           github-org: '{github-org}'
           project: '{name}'
@@ -18,12 +20,6 @@
       - test-results
       - console-log
 
-    scm:
-      - git:
-          url: 'git://git.openstack.org/{github-org}/{name}'
-          branches:
-            - 'origin/{branch}'
-
     node: bare-centos6
 
 
@@ -38,6 +34,8 @@
 
     builders:
       - revoke-sudo
+      - branch-git-prep:
+          branch: '{branch}'
       - python27:
           github-org: '{github-org}'
           project: '{name}'
@@ -47,12 +45,6 @@
       - test-results
       - console-log
 
-    scm:
-      - git:
-          url: 'git://git.openstack.org/{github-org}/{name}'
-          branches:
-            - 'origin/{branch}'
-
     node: '{node}'
 
 
@@ -67,6 +59,8 @@
 
     builders:
       - revoke-sudo
+      - branch-git-prep:
+          branch: '{branch}'
       - docs:
           github-org: '{github-org}'
           project: '{name}'
@@ -74,12 +68,6 @@
     publishers:
       - console-log
 
-    scm:
-      - git:
-          url: 'git://git.openstack.org/{github-org}/{name}'
-          branches:
-            - 'origin/{branch}'
-
     node: '{node}'
 
 
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml
index 120a6073a7..0817af070c 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml
@@ -18,6 +18,8 @@
 
     builders:
       - revoke-sudo
+      - branch-git-prep:
+          branch: master
       - shell: |
           #!/bin/bash -xe
           /usr/local/jenkins/slave_scripts/propose_translation_update.sh {github-org} {name}
@@ -25,12 +27,6 @@
     publishers:
       - console-log
 
-    scm:
-      - git:
-          url: 'git://git.openstack.org/{github-org}/{name}'
-          branches:
-            - 'origin/master'
-
     node: 'proposal'
 
 - job:
@@ -68,6 +64,8 @@
 
     builders:
       - revoke-sudo
+      - branch-git-prep:
+          branch: master
       - shell: |
           #!/bin/bash -xe
           /usr/local/jenkins/slave_scripts/propose_translation_update_manuals.sh {name}
@@ -75,12 +73,6 @@
     publishers:
       - console-log
 
-    scm:
-      - git:
-          url: 'git://git.openstack.org/{github-org}/{name}'
-          branches:
-            - 'origin/master'
-
     node: 'proposal'
 
 - job-group:
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml b/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml
index fb17d75284..913cdf93e0 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml
@@ -45,6 +45,8 @@
 
     builders:
       - revoke-sudo
+      - branch-git-prep:
+          branch: master
       - python27:
           github-org: 'openstack-infra'
           project: 'zuul'
@@ -53,10 +55,4 @@
       - test-results
       - console-log
 
-    scm:
-      - git:
-          url: 'git://git.openstack.org/openstack-infra/zuul'
-          branches:
-            - 'origin/master'
-
     node: bare-precise