Mobrovac has uploaded a new change for review. https://gerrit.wikimedia.org/r/200850
Change subject: Fix mising phab/ dir introduced in 55deca3 ...................................................................... Fix mising phab/ dir introduced in 55deca3 55deca3 added phab/ to .gitignore, while at the same time requiring the directory to be present in order to install arcanist (put as a dependency of mediawiki). Consequently, the provisioning would fail for fresh clones. This patch aims at quick-fixing this by forcing Puppet to ensure the parent directory exists when either arcanist of phabricator modules are being applied. Because they share a common parent directory, the /phab directory is required to be created before any git clone is to be executed. Note that this is only a quick fix, we should find a better way to organise things (as in general one does not need arcanist to be installed in order to run mediawiki). Bug: T94469 Bug: T94553 Change-Id: Icf333d03f2c7d0673c74a9ef01de72744ae6bb57 --- M puppet/modules/arcanist/manifests/init.pp M puppet/modules/phabricator/manifests/init.pp 2 files changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/50/200850/1 diff --git a/puppet/modules/arcanist/manifests/init.pp b/puppet/modules/arcanist/manifests/init.pp index 6f62b7c..721a4b8 100644 --- a/puppet/modules/arcanist/manifests/init.pp +++ b/puppet/modules/arcanist/manifests/init.pp @@ -12,6 +12,15 @@ ){ include ::php + if (!defined(File[$deploy_dir])) { + file { $deploy_dir: + ensure => 'directory', + owner => $::share_owner, + group => $::share_group, + } + File[$deploy_dir] -> Git::Clone <| |> + } + git::clone { 'https://github.com/phacility/libphutil': directory => "${deploy_dir}/libphutil", remote => 'https://github.com/phacility/libphutil', diff --git a/puppet/modules/phabricator/manifests/init.pp b/puppet/modules/phabricator/manifests/init.pp index a7079ad..277017e 100644 --- a/puppet/modules/phabricator/manifests/init.pp +++ b/puppet/modules/phabricator/manifests/init.pp @@ -24,6 +24,15 @@ ensure => present, } + if (!defined(File[$deploy_dir])) { + file { $deploy_dir: + ensure => 'directory', + owner => $::share_owner, + group => $::share_group, + } + File[$deploy_dir] -> Git::Clone <| |> + } + git::clone { 'https://github.com/phacility/phabricator': directory => "${deploy_dir}/phabricator", remote => 'https://github.com/phacility/phabricator', -- To view, visit https://gerrit.wikimedia.org/r/200850 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icf333d03f2c7d0673c74a9ef01de72744ae6bb57 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Mobrovac <mobro...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits