Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/59626
Change subject: package builder now supports Debian.org unstable ...................................................................... package builder now supports Debian.org unstable Whenever upstreaming a package to Debian.org, we want to be able to build it against their 'unstable' repository. This adds to points to debian.org APT repositories whenever the distribution is 'unstable'. Source list according to http://debgen.simplylinux.ch Change-Id: I4aa8bb5bed22dc982bc098b8357188b6f0017b4c --- M manifests/role/package-builder.pp M modules/package-builder/manifests/image.pp 2 files changed, 17 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/26/59626/1 diff --git a/manifests/role/package-builder.pp b/manifests/role/package-builder.pp index 40558a8..e9dfe8e 100644 --- a/manifests/role/package-builder.pp +++ b/manifests/role/package-builder.pp @@ -5,11 +5,11 @@ include package-builder package-builder::pbuilder { 'cowbuilder': - dists => 'lucid', + dists => [ 'lucid', 'unstable' ], defaultdist => 'precise', } package-builder::pbuilder { 'pbuilder': - dists => 'lucid', + dists => [ 'lucid', 'unstable' ], defaultdist => 'precise', } diff --git a/modules/package-builder/manifests/image.pp b/modules/package-builder/manifests/image.pp index 5f59492..bd65649 100644 --- a/modules/package-builder/manifests/image.pp +++ b/modules/package-builder/manifests/image.pp @@ -21,6 +21,8 @@ # The distribution to build for (hardy, lucid, precise..). *dist* is not # set by default which means the distribution will be interpolated from the # defined title (see *namevar*). +# When using the dist 'unstable', the repository will be pointed to a +# debian.org mirror. # # === Examples # @@ -69,10 +71,21 @@ default: { fail('Only package builder types supported are pbuilder and cowbuilder') } } + # Hack to support Debian unstable + case $realdist { + 'unstable': { + $othermirror = "--othermirror 'deb http://ftp.us.debian.org/debian ${realdist} main' --othermirror 'deb-src http://ftp.us.debian.org/debian ${realdist} main'" + $components = "--components 'main'" + } + default: { + # Points to Wikimedia Ubuntu mirror + $othermirror = "--othermirror 'deb http://apt.wikimedia.org/wikimedia ${realdist}-wikimedia main universe' --othermirror 'deb-src http://apt.wikimedia.org/wikimedia ${realdist}-wikimedia main universe'" + $components = "--components 'main universe'" + } + } + $pbuilder_root = '/var/cache/pbuilder' - $othermirror = "--othermirror 'deb http://apt.wikimedia.org/wikimedia ${realdist}-wikimedia main universe' --othermirror 'deb-src http://apt.wikimedia.org/wikimedia ${realdist}-wikimedia main universe'" - $components = "--components 'main universe'" $image_file = "${pbuilder_root}/${file_prefix}${realdist}.${file_ext}" exec { "imaging ${realdist} for ${realpbuilder}": -- To view, visit https://gerrit.wikimedia.org/r/59626 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4aa8bb5bed22dc982bc098b8357188b6f0017b4c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
