opendev/system-config
Code Issues Proposed changes

Merge "Make jenkins proposal jobs use dedicated user."

Browse Source
This commit is contained in:
Jenkins 2014-04-15 16:58:53 +00:00 committed by Gerrit Code Review
commit 2a848f9ff3
6 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/site.pp
View File

@ -551,10 +551,11 @@ node 'mirror33.slave.openstack.org' {
node 'proposal.slave.openstack.org' { node 'proposal.slave.openstack.org' {
include openstack_project include openstack_project
class { 'openstack_project::proposal_slave': class { 'openstack_project::proposal_slave':
transifex_username => 'openstackjenkins', transifex_username => 'openstackjenkins',
transifex_password => hiera('transifex_password'), transifex_password => hiera('transifex_password'),
jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key, jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key,
jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents'), proposal_ssh_public_key => hiera('proposal_ssh_public_key_contents'),
proposal_ssh_private_key => hiera('proposal_ssh_private_key_contents'),
} }
} }

6
modules/jenkins/files/slave_scripts/merge_tags.sh
View File

@ -16,9 +16,9 @@ TAG=$1
if $(git tag --contains origin/milestone-proposed | grep "^$TAG$" >/dev/null) if $(git tag --contains origin/milestone-proposed | grep "^$TAG$" >/dev/null)
then then
git config user.name "OpenStack Jenkins" git config user.name "OpenStack Proposal Bot"
git config user.email "jenkins@openstack.org" git config user.email "openstack-infra@lists.openstack.org"
git config gitreview.username "jenkins" git config gitreview.username "proposal-bot"
git review -s git review -s
git checkout master git checkout master

6
modules/jenkins/files/slave_scripts/propose_requirements_update.sh
View File

@ -23,9 +23,9 @@ if [ -z "$BRANCH" ] ; then
exit 1 exit 1
fi fi
git config user.name "OpenStack Jenkins" git config user.name "OpenStack Proposal Bot"
git config user.email "jenkins@openstack.org" git config user.email "openstack-infra@lists.openstack.org"
git config gitreview.username $USERNAME git config gitreview.username "proposal-bot"
for PROJECT in $(cat projects.txt); do for PROJECT in $(cat projects.txt); do

6
modules/jenkins/files/slave_scripts/propose_translation_update.sh
View File

@ -16,9 +16,9 @@ ORG=$1
PROJECT=$2 PROJECT=$2
COMMIT_MSG="Imported Translations from Transifex" COMMIT_MSG="Imported Translations from Transifex"
git config user.name "OpenStack Jenkins" git config user.name "OpenStack Proposal Bot"
git config user.email "jenkins@openstack.org" git config user.email "openstack-infra@lists.openstack.org"
git config gitreview.username "jenkins" git config gitreview.username "proposal-bot"
git review -s git review -s

6
modules/jenkins/files/slave_scripts/propose_translation_update_manuals.sh
View File

@ -26,9 +26,9 @@ fi
COMMIT_MSG="Imported Translations from Transifex" COMMIT_MSG="Imported Translations from Transifex"
git config user.name "OpenStack Jenkins" git config user.name "OpenStack Proposal Bot"
git config user.email "jenkins@openstack.org" git config user.email "openstack-infra@lists.openstack.org"
git config gitreview.username "jenkins" git config gitreview.username "proposal-bot"
git review -s git review -s

13
modules/openstack_project/manifests/proposal_slave.pp
View File

@ -5,7 +5,8 @@
# #
class openstack_project::proposal_slave ( class openstack_project::proposal_slave (
$jenkins_ssh_public_key, $jenkins_ssh_public_key,
$jenkins_ssh_private_key, $proposal_ssh_public_key,
$proposal_ssh_private_key,
$transifex_password = '', $transifex_password = '',
$transifex_username = 'openstackci', $transifex_username = 'openstackci',
) { ) {
@ -34,6 +35,14 @@ class openstack_project::proposal_slave (
group => 'jenkins', group => 'jenkins',
mode => '0400', mode => '0400',
require => File['/home/jenkins/.ssh'], require => File['/home/jenkins/.ssh'],
content => $jenkins_ssh_private_key, content => $proposal_ssh_private_key,
}
file { '/home/jenkins/.ssh/id_rsa.pub':
owner => 'jenkins',
group => 'jenkins',
mode => '0400',
require => File['/home/jenkins/.ssh'],
content => $proposal_ssh_public_key,
} }
} }