opendev/system-config
Code Issues Proposed changes

Remove transifex from the proposal slave

Browse Source 
We no longer run any transifex jobs on the proposal slave, or have any
jobs that make use of it, so stop ensuring transifex-client is
installed, and drop .transifexrc.

Change-Id: I9cd88e0dceae1f25612696d15c1e5c2a0f5e6056
This commit is contained in:
Steve Kowalik 2015-09-21 13:58:53 +10:00
parent cb1b51cd55
commit 039b2d63ea
3 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/site.pp
View File

@ -772,8 +772,6 @@ node /^ci-backup-.*\.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_password => hiera('transifex_password', 'XXX'),
jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key, jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key,
proposal_ssh_public_key => hiera('proposal_ssh_public_key_contents', 'XXX'), proposal_ssh_public_key => hiera('proposal_ssh_public_key_contents', 'XXX'),
proposal_ssh_private_key => hiera('proposal_ssh_private_key_contents', 'XXX'), proposal_ssh_private_key => hiera('proposal_ssh_private_key_contents', 'XXX'),

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

@ -7,8 +7,6 @@ class openstack_project::proposal_slave (
$jenkins_ssh_public_key, $jenkins_ssh_public_key,
$proposal_ssh_public_key, $proposal_ssh_public_key,
$proposal_ssh_private_key, $proposal_ssh_private_key,
$transifex_password = '',
$transifex_username = 'openstackci',
$jenkins_gitfullname = 'OpenStack Jenkins', $jenkins_gitfullname = 'OpenStack Jenkins',
$jenkins_gitemail = 'jenkins@openstack.org', $jenkins_gitemail = 'jenkins@openstack.org',
$project_config_repo = 'https://git.openstack.org/openstack-infra/project-config', $project_config_repo = 'https://git.openstack.org/openstack-infra/project-config',
@ -30,21 +28,12 @@ class openstack_project::proposal_slave (
project_config_repo => $project_config_repo, project_config_repo => $project_config_repo,
} }
package { ['transifex-client', 'Babel', 'pyopenssl', 'ndg-httpsclient', 'pyasn1']: package { ['Babel', 'pyopenssl', 'ndg-httpsclient', 'pyasn1']:
ensure => latest, ensure => latest,
provider => pip, provider => pip,
require => Class['pip'], require => Class['pip'],
} }
file { '/home/jenkins/.transifexrc':
ensure => present,
owner => 'jenkins',
group => 'jenkins',
mode => '0600',
content => template('openstack_project/transifexrc.erb'),
require => User['jenkins'],
}
file { '/home/jenkins/.ssh/id_rsa': file { '/home/jenkins/.ssh/id_rsa':
owner => 'jenkins', owner => 'jenkins',
group => 'jenkins', group => 'jenkins',

5
modules/openstack_project/templates/transifexrc.erb
View File

@ -1,5 +0,0 @@
[https://www.transifex.com]
hostname = https://www.transifex.com
password = <%= transifex_password %>
token =
username = <%= transifex_username %>