Akosiaris has submitted this change and it was merged.
Change subject: contint: fetch slave scripts on slaves
......................................................................
contint: fetch slave scripts on slaves
To assist us in testing, we maintain a bunch of tools, scripts and
wrappers under integration/jenkins.git. The material there is a
requirement for most of our jobs, unfortunately it is only checked out
on the historical server gallium.
The contint::slave-scripts let us clone the repository under
/srv/slave-scripts on any slave that might need it (aka continuous
integration slaves in production, browsertests in labs).
Change-Id: I0b798d4c896957f2b9eed495c4198eda369d771a
---
M manifests/misc/contint.pp
M manifests/role/ci.pp
A modules/contint/manifests/slave-scripts.pp
3 files changed, 15 insertions(+), 3 deletions(-)
Approvals:
Akosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/contint.pp b/manifests/misc/contint.pp
index adf9263..ea902f3 100644
--- a/manifests/misc/contint.pp
+++ b/manifests/misc/contint.pp
@@ -29,8 +29,9 @@
# better place under contint module.
class jenkins {
- # FIXME needs to be migrated somewhere else
- # Maybe contint::slave-scripts
+ # As of October 2013, the slave scripts are installed with
+ # contint::slave-scripts and land under /srv/jenkins.
+ # FIXME: clean up Jenkins jobs to no more refer to the paths below:
file {
'/var/lib/jenkins/.git':
ensure => directory,
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index 0c79794..cdb3f7a 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -92,6 +92,7 @@
system_role { 'role::ci::slave': description => 'CI slave runner' }
include contint::packages,
+ contint::slave-scripts,
role::gerrit::production::replicationdest
class { 'jenkins::slave':
@@ -164,7 +165,8 @@
fail( 'role::ci::slave::browsertests must only be applied in labs' )
}
- include role::ci::slave::labs::common
+ include role::ci::slave::labs::common,
+ contint::slave-scripts
# We are in labs context, so use /mnt (== /dev/vdb)
# Never EVER think about using GlusterFS.
diff --git a/modules/contint/manifests/slave-scripts.pp
b/modules/contint/manifests/slave-scripts.pp
new file mode 100644
index 0000000..e930aec
--- /dev/null
+++ b/modules/contint/manifests/slave-scripts.pp
@@ -0,0 +1,9 @@
+class contint::slave-scripts {
+
+ git::clone { 'jenkins CI slave scripts':
+ ensure => 'latest',
+ directory => '/srv/slave-scripts',
+ origin =>
'https://gerrit.wikimedia.org/r/p/integration/jenkins.git',
+ }
+
+}
--
To view, visit https://gerrit.wikimedia.org/r/87058
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0b798d4c896957f2b9eed495c4198eda369d771a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Akosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
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
