[MediaWiki-commits] [Gerrit] Install arcanist from apt rather than git. - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: Install arcanist from apt rather than git. .. Install arcanist from apt rather than git. Change-Id: Icba0354d30ece9ae66e53518f3b2577d082c5729 --- A modules/contint/files/arcrc.json A modules/contint/manifests/arcanist.pp M modules/phabricator/manifests/arcanist.pp 3 files changed, 22 insertions(+), 21 deletions(-) Approvals: Filippo Giunchedi: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/contint/files/arcrc.json b/modules/contint/files/arcrc.json new file mode 100644 index 000..0b8ad2c --- /dev/null +++ b/modules/contint/files/arcrc.json @@ -0,0 +1,5 @@ +{ +"config": { + "default": "https://phabricator.wikimedia.org/; +} +} diff --git a/modules/contint/manifests/arcanist.pp b/modules/contint/manifests/arcanist.pp new file mode 100644 index 000..8ead13c --- /dev/null +++ b/modules/contint/manifests/arcanist.pp @@ -0,0 +1,14 @@ +# Install arcanist and the .arcrc so that it can find our phabricator instance +# this is needed for running `arc lint` and `arc unit` on contint slaves. +class contint::arcanist { +require_package('arcanist') + +file { '/var/lib/jenkins/.arcrc': +ensure => 'file', +owner => 'jenkins', +group => 'jenkins', +mode=> '0600', +require => User['jenkins'], +source => 'puppet:///modules/contint/arcrc.json', +} +} diff --git a/modules/phabricator/manifests/arcanist.pp b/modules/phabricator/manifests/arcanist.pp index 236b18b..31e8bad 100644 --- a/modules/phabricator/manifests/arcanist.pp +++ b/modules/phabricator/manifests/arcanist.pp @@ -1,25 +1,7 @@ # == Class: phabricator::arcanist # -# Clone the arcanist and libphutil repositories into /usr/local/share/, then -# link /usr/local/bin/arc to the arc executable +# Installs the phabricator client, arcanist, from apt. # -class phabricator::arcanist() { -git::clone { 'phabricator/libphutil': -directory => '/usr/local/share/libphutil', -branch=> 'stable', -} - -git::clone { 'phabricator/arcanist': -directory => '/usr/local/share/arcanist', -branch=> 'stable', -require => Git::Clone['phabricator/libphutil'], -} - -file { '/usr/local/bin/arc': - ensure => 'link', - target => '/usr/local/share/arcanist/bin/arc', - owner => 'root', - group => 'root', - require => Git::Clone['phabricator/arcanist'], -} +class phabricator::arcanist { +require_package('arcanist') } -- To view, visit https://gerrit.wikimedia.org/r/295975 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icba0354d30ece9ae66e53518f3b2577d082c5729 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: 20after4Gerrit-Reviewer: Chasemp Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Filippo Giunchedi Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Install arcanist from apt rather than git. - change (operations/puppet)
20after4 has uploaded a new change for review. https://gerrit.wikimedia.org/r/295975 Change subject: Install arcanist from apt rather than git. .. Install arcanist from apt rather than git. Change-Id: Icba0354d30ece9ae66e53518f3b2577d082c5729 --- A modules/contint/files/arcrc.json A modules/contint/manifests/arcanist.pp M modules/phabricator/manifests/arcanist.pp 3 files changed, 22 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/75/295975/1 diff --git a/modules/contint/files/arcrc.json b/modules/contint/files/arcrc.json new file mode 100644 index 000..0b8ad2c --- /dev/null +++ b/modules/contint/files/arcrc.json @@ -0,0 +1,5 @@ +{ +"config": { + "default": "https://phabricator.wikimedia.org/; +} +} diff --git a/modules/contint/manifests/arcanist.pp b/modules/contint/manifests/arcanist.pp new file mode 100644 index 000..8ead13c --- /dev/null +++ b/modules/contint/manifests/arcanist.pp @@ -0,0 +1,14 @@ +# Install arcanist and the .arcrc so that it can find our phabricator instance +# this is needed for running `arc lint` and `arc unit` on contint slaves. +class contint::arcanist { +require_package('arcanist') + +file { '/var/lib/jenkins/.arcrc': +ensure => 'file', +owner => 'jenkins', +group => 'jenkins', +mode=> '0600', +require => User['jenkins'], +source => 'puppet:///modules/contint/arcrc.json', +} +} diff --git a/modules/phabricator/manifests/arcanist.pp b/modules/phabricator/manifests/arcanist.pp index 236b18b..31e8bad 100644 --- a/modules/phabricator/manifests/arcanist.pp +++ b/modules/phabricator/manifests/arcanist.pp @@ -1,25 +1,7 @@ # == Class: phabricator::arcanist # -# Clone the arcanist and libphutil repositories into /usr/local/share/, then -# link /usr/local/bin/arc to the arc executable +# Installs the phabricator client, arcanist, from apt. # -class phabricator::arcanist() { -git::clone { 'phabricator/libphutil': -directory => '/usr/local/share/libphutil', -branch=> 'stable', -} - -git::clone { 'phabricator/arcanist': -directory => '/usr/local/share/arcanist', -branch=> 'stable', -require => Git::Clone['phabricator/libphutil'], -} - -file { '/usr/local/bin/arc': - ensure => 'link', - target => '/usr/local/share/arcanist/bin/arc', - owner => 'root', - group => 'root', - require => Git::Clone['phabricator/arcanist'], -} +class phabricator::arcanist { +require_package('arcanist') } -- To view, visit https://gerrit.wikimedia.org/r/295975 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icba0354d30ece9ae66e53518f3b2577d082c5729 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: 20after4___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits