From 7fb2a0c340f392d2e5f8a5ea4e317fdfd437f71e Mon Sep 17 00:00:00 2001
From: Thiago Paiva <thiagop@lsd.ufcg.edu.br>
Date: Wed, 27 Jul 2016 17:50:14 -0300
Subject: [PATCH] Pinning JJB and Zuul for 3rd party CI

Some changes affecting the syntax and use of JJB and Zuul were made in order to
use it with Zuulv3. The objective of this patch is to expose variables and pin
the versions of these services since the recommendation for now for 3rd party
CI maintainers is to not update.

Change-Id: I289186b7a25755c9258897202f01d278d0cc5a75
---
 contrib/single_node_ci_data.yaml | 4 +++-
 contrib/single_node_ci_site.pp   | 3 +++
 manifests/single_node_ci.pp      | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/contrib/single_node_ci_data.yaml b/contrib/single_node_ci_data.yaml
index f655f2c..0285283 100644
--- a/contrib/single_node_ci_data.yaml
+++ b/contrib/single_node_ci_data.yaml
@@ -11,6 +11,8 @@ jenkins_ssh_private_key: |
   Insert jenkins private key here
   -----END RSA PRIVATE KEY-----
 jenkins_ssh_public_key:  your-jenkins-public-key-no-whitespace
+jjb_git_revision: 1.6.1
+#jjb_git_url: https://git.openstack.org/openstack-infra/jenkins-job-builder
 #gerrit_server: review.openstack.org
 #gerrit_ssh_host_key:
 gerrit_user: your-gerrit-user
@@ -25,7 +27,7 @@ log_server: logs.example.com
 #smtp_host:
 #smtp_default_from:
 #smtp_default_to:
-#zuul_revision: master
+zuul_revision: 2.1.0
 #zuul_git_source_repo: https://git.openstack.org/openstack-infra/zuul
 oscc_file_contents: |
   # Insert OSCC file contents here as explained in the
diff --git a/contrib/single_node_ci_site.pp b/contrib/single_node_ci_site.pp
index 0ae9391..71a929a 100644
--- a/contrib/single_node_ci_site.pp
+++ b/contrib/single_node_ci_site.pp
@@ -60,6 +60,9 @@ node default {
     nodepool_revision           => hiera('nodepool_revision', 'master'),
     nodepool_git_source_repo    => hiera('nodepool_git_source_repo',
       'https://git.openstack.org/openstack-infra/nodepool'),
+    jjb_git_revision            => hiera('jjb_git_revision', 'master'),
+    jjb_git_url                 => hiera('jjb_git_url',
+      'https://git.openstack.org/openstack-infra/jenkins-job-builder'),
   }
 }
 
diff --git a/manifests/single_node_ci.pp b/manifests/single_node_ci.pp
index 593dec6..3941930 100644
--- a/manifests/single_node_ci.pp
+++ b/manifests/single_node_ci.pp
@@ -148,6 +148,8 @@ class openstackci::single_node_ci (
   $jenkins_password              = undef,
   $jenkins_ssh_private_key       = undef,
   $jenkins_ssh_public_key        = undef,
+  $jjb_git_revision              = 'master',
+  $jjb_git_url                   = 'https://git.openstack.org/openstack-infra/jenkins-job-builder',
 
   # Zuul Configurations
   $gerrit_server                 = 'review.openstack.org',
@@ -187,6 +189,8 @@ class openstackci::single_node_ci (
     jenkins_password        => $jenkins_password,
     project_config_repo     => $project_config_repo,
     log_server              => $log_server,
+    jjb_git_revision        => $jjb_git_revision,
+    jjb_git_url             => $jjb_git_url,
   }
 
   class { '::openstackci::zuul_merger':