opendev/puppet-openstackci
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2016-08-04 08:10:33 +00:00 committed by Gerrit Code Review
commit b54527ac77
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/single_node_ci_data.yaml
View File

@ -11,6 +11,8 @@ jenkins_ssh_private_key: |
Insert jenkins private key here Insert jenkins private key here
-----END RSA PRIVATE KEY----- -----END RSA PRIVATE KEY-----
jenkins_ssh_public_key: your-jenkins-public-key-no-whitespace 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_server: review.openstack.org
#gerrit_ssh_host_key: #gerrit_ssh_host_key:
gerrit_user: your-gerrit-user gerrit_user: your-gerrit-user
@ -25,7 +27,7 @@ log_server: logs.example.com
#smtp_host: #smtp_host:
#smtp_default_from: #smtp_default_from:
#smtp_default_to: #smtp_default_to:
#zuul_revision: master zuul_revision: 2.1.0
#zuul_git_source_repo: https://git.openstack.org/openstack-infra/zuul #zuul_git_source_repo: https://git.openstack.org/openstack-infra/zuul
oscc_file_contents: | oscc_file_contents: |
# Insert OSCC file contents here as explained in the # Insert OSCC file contents here as explained in the

3
contrib/single_node_ci_site.pp
View File

@ -60,6 +60,9 @@ node default {
nodepool_revision => hiera('nodepool_revision', 'master'), nodepool_revision => hiera('nodepool_revision', 'master'),
nodepool_git_source_repo => hiera('nodepool_git_source_repo', nodepool_git_source_repo => hiera('nodepool_git_source_repo',
'https://git.openstack.org/openstack-infra/nodepool'), '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'),
} }
} }

4
manifests/single_node_ci.pp
View File

@ -148,6 +148,8 @@ class openstackci::single_node_ci (
$jenkins_password = undef, $jenkins_password = undef,
$jenkins_ssh_private_key = undef, $jenkins_ssh_private_key = undef,
$jenkins_ssh_public_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 # Zuul Configurations
$gerrit_server = 'review.openstack.org', $gerrit_server = 'review.openstack.org',
@ -187,6 +189,8 @@ class openstackci::single_node_ci (
jenkins_password => $jenkins_password, jenkins_password => $jenkins_password,
project_config_repo => $project_config_repo, project_config_repo => $project_config_repo,
log_server => $log_server, log_server => $log_server,
jjb_git_revision => $jjb_git_revision,
jjb_git_url => $jjb_git_url,
} }
class { '::openstackci::zuul_merger': class { '::openstackci::zuul_merger':