Filippo Giunchedi has submitted this change and it was merged.
Change subject: contint: fix resource ordering for labs slave
......................................................................
contint: fix resource ordering for labs slave
cowbuilder is installed via jenkins-debian-glue, and creates
/var/cache/pbuilder. That requires the symlink to /mnt/pbuilder.
Change-Id: Icc787b554fa64bca3eb21e8ea4e7e7652abe799f
---
M modules/contint/manifests/packages/labs.pp
1 file changed, 6 insertions(+), 4 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
Giuseppe Lavagetto: Looks good to me, but someone else must approve
Hashar: Looks good to me, but someone else must approve
diff --git a/modules/contint/manifests/packages/labs.pp
b/modules/contint/manifests/packages/labs.pp
index c9c7e76..357191d 100644
--- a/modules/contint/manifests/packages/labs.pp
+++ b/modules/contint/manifests/packages/labs.pp
@@ -27,8 +27,9 @@
}
file { '/var/cache/pbuilder':
- ensure => link,
- target => '/mnt/pbuilder',
+ ensure => link,
+ target => '/mnt/pbuilder',
+ require => File['/mnt/pbuilder'],
}
package { [
@@ -40,8 +41,9 @@
'jenkins-debian-glue-buildenv-taptools',
]:
ensure => latest,
- # Make sure cowbuilder images will be on /mnt
- require => File['/mnt/pbuilder'],
+ # cowbuilder file hierarchy needs to be created after the symlink
+ # points to the mounted disk.
+ require => File['/var/cache/pbuilder'],
}
# end of jenkins-debian glue puppetization
--
To view, visit https://gerrit.wikimedia.org/r/136310
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icc787b554fa64bca3eb21e8ea4e7e7652abe799f
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
