Dzahn has submitted this change and it was merged.
Change subject: contint::slave-scripts recurse submodules
......................................................................
contint::slave-scripts recurse submodules
All git::clone must recurse in submodules since some of the
integration/* repositories have ... submodules!
Change-Id: Ib1815b84f10f6e076dafaaf306cd20b092e3756a
---
M modules/contint/manifests/slave-scripts.pp
1 file changed, 16 insertions(+), 12 deletions(-)
Approvals:
Hashar: Verified; Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/contint/manifests/slave-scripts.pp
b/modules/contint/manifests/slave-scripts.pp
index 284f10a..ed6da2f 100644
--- a/modules/contint/manifests/slave-scripts.pp
+++ b/modules/contint/manifests/slave-scripts.pp
@@ -5,25 +5,29 @@
}
git::clone { 'jenkins CI slave scripts':
- ensure => 'latest',
- directory => '/srv/deployment/integration/slave-scripts',
- origin =>
'https://gerrit.wikimedia.org/r/p/integration/jenkins.git',
+ ensure => 'latest',
+ directory => '/srv/deployment/integration/slave-scripts',
+ origin =>
'https://gerrit.wikimedia.org/r/p/integration/jenkins.git',
+ recurse_submodules => true,
}
# We can not git-deploy on labs, so use the good old git::clone
git::clone { 'jenkins CI kss':
- ensure => 'latest',
- directory => '/srv/deployment/integration/kss',
- origin => 'https://gerrit.wikimedia.org/r/p/integration/kss.git',
+ ensure => 'latest',
+ directory => '/srv/deployment/integration/kss',
+ origin =>
'https://gerrit.wikimedia.org/r/p/integration/kss.git',
+ recurse_submodules => true,
}
git::clone { 'jenkins CI phpcs':
- ensure => 'latest',
- directory => '/srv/deployment/integration/phpcs',
- origin => 'https://gerrit.wikimedia.org/r/p/integration/phpcs.git',
+ ensure => 'latest',
+ directory => '/srv/deployment/integration/phpcs',
+ origin =>
'https://gerrit.wikimedia.org/r/p/integration/phpcs.git',
+ recurse_submodules => true,
}
git::clone { 'jenkins CI phpunit':
- ensure => 'latest',
- directory => '/srv/deployment/integration/phpunit',
- origin =>
'https://gerrit.wikimedia.org/r/p/integration/phpunit.git',
+ ensure => 'latest',
+ directory => '/srv/deployment/integration/phpunit',
+ origin =>
'https://gerrit.wikimedia.org/r/p/integration/phpunit.git',
+ recurse_submodules => true,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/122342
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1815b84f10f6e076dafaaf306cd20b092e3756a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
