Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/114597
Change subject: contint: webproxy for maven on CI production slaves
......................................................................
contint: webproxy for maven on CI production slaves
Some Jenkins slaves in production do not have direct access to internet.
That prevents Maven from downloading the whole internet. This publish a
~/.m2/settings.xml which configure webproxy.{::realm}.wmnet as a proxy.
Tested out on lanthanum.eqiad.wmnet by editing
/var/lib/jenkins-slave/.m2/settings.xml
Example build:
http://integration.wikimedia.org/ci/job/analytics-kraken/2/console
Change-Id: I6cc88db28ae86e1c7fa5ee18ea46b586cf67499f
---
M manifests/role/ci.pp
A modules/contint/manifests/maven-settings.pp
A modules/contint/templates/maven-webproxy.xml.erb
3 files changed, 32 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/97/114597/1
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index d2235fd..17c961f 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -134,6 +134,9 @@
require => User['jenkins-slave'],
}
+ # Maven require a webproxy on production slaves
+ include contint::maven-webproxy
+
contint::tmpfs { 'tmpfs for jenkins CI slave':
user => 'jenkins-slave',
group => 'jenkins-slave',
diff --git a/modules/contint/manifests/maven-settings.pp
b/modules/contint/manifests/maven-settings.pp
new file mode 100644
index 0000000..81c5e4e
--- /dev/null
+++ b/modules/contint/manifests/maven-settings.pp
@@ -0,0 +1,13 @@
+# Maintains maven settings for the jenkins-slave user
+class contint::maven-webproxy {
+
+ file { '/var/lib/jenkins-slave/.m2':
+ ensure => directory,
+ }
+
+ file { '/var/lib/jenkins-slave/.m2/settings.xml':
+ mode => '0444',
+ content => template('contint/maven-webproxy.xml.erb'),
+ }
+
+}
diff --git a/modules/contint/templates/maven-webproxy.xml.erb
b/modules/contint/templates/maven-webproxy.xml.erb
new file mode 100644
index 0000000..193b135
--- /dev/null
+++ b/modules/contint/templates/maven-webproxy.xml.erb
@@ -0,0 +1,16 @@
+<!--
+ WARNING: this file is managed by puppet
+ puppet://modules/contint/templates/maven-settings.xml.erb
+
+ Configure Maven on Jenkins CI slaves to use Wikimedia web proxy
+ since some slaves do not have direct access to internet.
+-->
+<settings>
+ <proxies>
+ <proxy>
+ <active>true</active>
+ <host>webproxy.<%= scope.lookupvar('::site')
%>.wmnet</host>
+ <port>8080</port>
+ </proxy>
+ </proxies>
+</settings>
--
To view, visit https://gerrit.wikimedia.org/r/114597
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6cc88db28ae86e1c7fa5ee18ea46b586cf67499f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
