Mark Bergsma has submitted this change and it was merged.
Change subject: Create pbuilder images with ubuntu APT components main and
universe
......................................................................
Create pbuilder images with ubuntu APT components main and universe
Change-Id: Ia2ccda734ea550cc227266f489f18a2161bb8cda
---
M manifests/misc/package-builder.pp
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/package-builder.pp
b/manifests/misc/package-builder.pp
index 10f1c52..823e549 100644
--- a/manifests/misc/package-builder.pp
+++ b/manifests/misc/package-builder.pp
@@ -44,9 +44,10 @@
$pbuilder_root = "/var/cache/pbuilder"
$othermirror = "--othermirror 'deb
http://apt.wikimedia.org/wikimedia ${title}-wikimedia main universe'
--othermirror 'deb-src http://apt.wikimedia.org/wikimedia ${title}-wikimedia
main universe'"
+ $components = "--components 'main universe'"
exec { "pbuilder --create --distribution ${title}":
- command => "pbuilder --create --distribution
${title} --basetgz ${pbuilder_root}/${title}.tgz ${othermirror}",
+ command => "pbuilder --create --distribution
${title} --basetgz ${pbuilder_root}/${title}.tgz ${components} ${othermirror}",
creates => "${pbuilder_root}/${title}.tgz",
path => "/bin:/sbin:/usr/bin:/usr/sbin",
timeout => 600
--
To view, visit https://gerrit.wikimedia.org/r/53358
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2ccda734ea550cc227266f489f18a2161bb8cda
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
