From 039b2d63ea73ac7e6ba5a0578421ec0befb67da3 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Mon, 21 Sep 2015 13:58:53 +1000 Subject: [PATCH] Remove transifex from the proposal slave 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 --- manifests/site.pp | 2 -- .../openstack_project/manifests/proposal_slave.pp | 13 +------------ modules/openstack_project/templates/transifexrc.erb | 5 ----- 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 modules/openstack_project/templates/transifexrc.erb diff --git a/manifests/site.pp b/manifests/site.pp index c6a3855df0..5981305a77 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -772,8 +772,6 @@ node /^ci-backup-.*\.openstack\.org$/ { node 'proposal.slave.openstack.org' { include openstack_project class { 'openstack_project::proposal_slave': - transifex_username => 'openstackjenkins', - transifex_password => hiera('transifex_password', 'XXX'), jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key, proposal_ssh_public_key => hiera('proposal_ssh_public_key_contents', 'XXX'), proposal_ssh_private_key => hiera('proposal_ssh_private_key_contents', 'XXX'), diff --git a/modules/openstack_project/manifests/proposal_slave.pp b/modules/openstack_project/manifests/proposal_slave.pp index 608715449d..0455afd34d 100644 --- a/modules/openstack_project/manifests/proposal_slave.pp +++ b/modules/openstack_project/manifests/proposal_slave.pp @@ -7,8 +7,6 @@ class openstack_project::proposal_slave ( $jenkins_ssh_public_key, $proposal_ssh_public_key, $proposal_ssh_private_key, - $transifex_password = '', - $transifex_username = 'openstackci', $jenkins_gitfullname = 'OpenStack Jenkins', $jenkins_gitemail = 'jenkins@openstack.org', $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, } - package { ['transifex-client', 'Babel', 'pyopenssl', 'ndg-httpsclient', 'pyasn1']: + package { ['Babel', 'pyopenssl', 'ndg-httpsclient', 'pyasn1']: ensure => latest, provider => 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': owner => 'jenkins', group => 'jenkins', diff --git a/modules/openstack_project/templates/transifexrc.erb b/modules/openstack_project/templates/transifexrc.erb deleted file mode 100644 index 6166707331..0000000000 --- a/modules/openstack_project/templates/transifexrc.erb +++ /dev/null @@ -1,5 +0,0 @@ -[https://www.transifex.com] -hostname = https://www.transifex.com -password = <%= transifex_password %> -token = -username = <%= transifex_username %>