Merge "Added recent version of npm to release slave"

This commit is contained in:
Jenkins 2015-10-07 18:35:58 +00:00 committed by Gerrit Code Review
commit 7596ddf6c6
2 changed files with 11 additions and 17 deletions

View File

@ -53,25 +53,17 @@ class openstack_project::release_slave (
require => Class['pip'], require => Class['pip'],
} }
exec { 'uninstall /usr/local/bin/npm': class { '::nodejs':
command => 'npm uninstall npm --prefix=/usr/local -g', repo_url_suffix => 'node_0.12',
onlyif => 'test -d /usr/local/lib/node_modules',
path => '/usr/local/bin:/usr/bin',
} }
package { ['npm', 'nodejs', 'nodejs-legacy']: file { '/home/jenkins/.npmrc':
ensure => purged, ensure => present,
require => Exec['uninstall /usr/local/bin/npm'], owner => 'jenkins',
} group => 'jenkins',
mode => '0600',
file { ['/usr/share/npm', content => template('openstack_project/npmrc.erb'),
'/usr/lib/node_modules', require => File['/home/jenkins'],
'/root/.npm',
'/etc/npmrc',
'/home/jenkins/.npmrc']:
ensure => absent,
force => true,
require => Package['npm']
} }
file { '/home/jenkins/.pypirc': file { '/home/jenkins/.pypirc':

View File

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