opendev/puppet-openstackci
Code Issues Proposed changes

change default jjb revision to 1.6.2

Browse Source 
pbr released 2.0.0 verion but jjb 1.6.1 has a cap on the pbr version
causing version conflict complaint when running jjb command.
https://bugs.launchpad.net/python-jenkins/+bug/1669086

Change-Id: I453180b93e624c302743d52130c82c3bb653bfb5
Closes-bug: 1669086
This commit is contained in:
Jerry Zhao 2017-03-01 11:31:59 -08:00
parent edca76ff34
commit d7229ac470
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/single_node_ci_data.yaml
View File

@ -17,7 +17,7 @@ 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_revision: 1.6.2
#jjb_git_url: https://git.openstack.org/openstack-infra/jenkins-job-builder
#gerrit_server: review.openstack.org
#gerrit_ssh_host_key:

2
contrib/single_node_ci_site.pp
View File

@ -62,7 +62,7 @@ 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', '1.6.1'),
jjb_git_revision => hiera('jjb_git_revision', '1.6.2'),
jjb_git_url => hiera('jjb_git_url',
'https://git.openstack.org/openstack-infra/jenkins-job-builder'),
}