Ema has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382403 )

Change subject: package_builder: add D03wikimedia-experimental hook
......................................................................

package_builder: add D03wikimedia-experimental hook

In order to use packages uploaded to experimental as build dependencies,
D03wikimedia-experimental enables the experimental component from
apt.wikimedia.org if the WIKIMEDIA_EXPERIMENTAL environment variable is
set to "yes".

Change-Id: I9b838b3f5072edb886e0e01b7dea86634bd64d20
---
M modules/package_builder/manifests/pbuilder_hook.pp
A modules/package_builder/templates/D03wikimedia-experimental.erb
2 files changed, 20 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/03/382403/1

diff --git a/modules/package_builder/manifests/pbuilder_hook.pp 
b/modules/package_builder/manifests/pbuilder_hook.pp
index 9d0b8c0..11d2a5e 100644
--- a/modules/package_builder/manifests/pbuilder_hook.pp
+++ b/modules/package_builder/manifests/pbuilder_hook.pp
@@ -37,6 +37,14 @@
         content => template('package_builder/D02backports.erb'),
     }
 
+    file { "${basepath}/hooks/${distribution}/D03-wikimedia-experimental":
+        ensure  => present,
+        owner   => 'root',
+        group   => 'root',
+        mode    => '0555',
+        content => template('package_builder/D03-wikimedia-experimental.erb'),
+    }
+
     file { "${basepath}/hooks/${distribution}/D05localsources":
         ensure  => present,
         owner   => 'root',
diff --git a/modules/package_builder/templates/D03wikimedia-experimental.erb 
b/modules/package_builder/templates/D03wikimedia-experimental.erb
new file mode 100644
index 0000000..04d1c64
--- /dev/null
+++ b/modules/package_builder/templates/D03wikimedia-experimental.erb
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# Avoid running hook if wikimedia_experimental is not specified
+if [ "${WIKIMEDIA_EXPERIMENTAL}" = "yes" ]; then
+       cat > /etc/apt/sources.list.d/wikimedia-experimental.list <<-'EOF'
+       deb <%= @mirror %> <%= @distribution %>-wikimedia experimental
+       deb-src <%= @mirror %> <%= @distribution %>-wikimedia experimental
+EOF
+       apt-get install wget gnupg -y
+       wget -O - -o /dev/null 
http://apt.wikimedia.org/autoinstall/keyring/wikimedia-archive-keyring.gpg | 
apt-key add -
+       apt-get update
+fi

-- 
To view, visit https://gerrit.wikimedia.org/r/382403
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b838b3f5072edb886e0e01b7dea86634bd64d20
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to