From d7229ac4701c4701c90f9617dc8b13c040ddfc5e Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Wed, 1 Mar 2017 11:31:59 -0800 Subject: [PATCH] change default jjb revision to 1.6.2 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 --- contrib/single_node_ci_data.yaml | 2 +- contrib/single_node_ci_site.pp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/single_node_ci_data.yaml b/contrib/single_node_ci_data.yaml index e092904..a40bcee 100644 --- a/contrib/single_node_ci_data.yaml +++ b/contrib/single_node_ci_data.yaml @@ -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: diff --git a/contrib/single_node_ci_site.pp b/contrib/single_node_ci_site.pp index 5d3c268..0aafcb3 100644 --- a/contrib/single_node_ci_site.pp +++ b/contrib/single_node_ci_site.pp @@ -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'), }