opendev/system-config
Code Issues Proposed changes

Merge "Added NPM Publishing credentials to pypi slave."

Browse Source
This commit is contained in:
Jenkins 2015-08-06 18:48:45 +00:00 committed by Gerrit Code Review
commit 53676ea705
3 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/site.pp
View File

@ -742,6 +742,9 @@ node 'release.slave.openstack.org' {
mavencentral_password => hiera('mavencentral_org_password', 'XXX'), mavencentral_password => hiera('mavencentral_org_password', 'XXX'),
puppet_forge_username => hiera('puppet_forge_username', 'username'), puppet_forge_username => hiera('puppet_forge_username', 'username'),
puppet_forge_password => hiera('puppet_forge_password', 'XXX'), puppet_forge_password => hiera('puppet_forge_password', 'XXX'),
npm_username => 'openstackci',
npm_userpassword => hiera('npm_user_password', 'XXX'),
npm_userurl => 'https://openstack.org',
} }
} }

16
modules/openstack_project/manifests/release_slave.pp
View File

@ -28,6 +28,9 @@ class openstack_project::release_slave (
$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',
$npm_username,
$npm_userpassword,
$npm_userurl,
) { ) {
class { 'openstack_project::slave': class { 'openstack_project::slave':
ssh_key => $jenkins_ssh_public_key, ssh_key => $jenkins_ssh_public_key,
@ -50,6 +53,10 @@ class openstack_project::release_slave (
require => Class['pip'], require => Class['pip'],
} }
package { ['nodejs', 'nodejs-legacy', 'npm']:
ensure => latest
}
file { '/home/jenkins/.pypirc': file { '/home/jenkins/.pypirc':
ensure => present, ensure => present,
owner => 'jenkins', owner => 'jenkins',
@ -59,6 +66,15 @@ class openstack_project::release_slave (
require => File['/home/jenkins'], require => File['/home/jenkins'],
} }
file { '/home/jenkins/.npmrc':
ensure => present,
owner => 'jenkins',
group => 'jenkins',
mode => '0600',
content => template('openstack_project/npmrc.erb'),
require => File['/home/jenkins'],
}
file { '/home/jenkins/.jenkinsci-curl': file { '/home/jenkins/.jenkinsci-curl':
ensure => present, ensure => present,
owner => 'jenkins', owner => 'jenkins',

12
modules/openstack_project/templates/npmrc.erb Normal file
View File

@ -0,0 +1,12 @@
<%
require 'base64'
%>
init.author.name=<%= jenkins_gitfullname %>
init.author.email=<%= jenkins_gitemail %>
init.author.url=<%= npm_userurl %>
tag-version-prefix=
sign-git-tag=true
//registry.npmjs.org/:username=<%= npm_username %>
//registry.npmjs.org/:_password=<%= Base64.encode64(npm_userpassword) %>
//registry.npmjs.org/:email=<%= jenkins_gitemail %>