Merge "Pinning JJB and Zuul for 3rd party CI"

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

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'),
   }
 }
 

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':