Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/58899
Change subject: zuul: migrate git dir in production to the ssd
......................................................................
zuul: migrate git dir in production to the ssd
The git workspace used by Zuul is on the slow disk. This patch points
Zuul to use the new SSD at /srv/ssd/zuul/git .
Zuul will need to be shutdown and the repository moved from the old
directory to the new one.
Change-Id: Ibbd118f00bd8a76abcc33e203d0928f383b08040
---
M manifests/role/zuul.pp
M manifests/zuul.pp
2 files changed, 20 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/99/58899/1
diff --git a/manifests/role/zuul.pp b/manifests/role/zuul.pp
index d32c631..b42e770 100644
--- a/manifests/role/zuul.pp
+++ b/manifests/role/zuul.pp
@@ -21,6 +21,7 @@
url_pattern =>
'http://integration.wmflabs.org/ci/job/{job.name}/{build.number}/console',
status_url =>
'http://integration.wmflabs.org/zuul/status',
git_branch => 'labs',
+ git_dir => '/var/lib/zuul/git',
push_change_refs => false
}
@@ -41,6 +42,22 @@
system_role { "role::zuul::production": description => "Zuul on
production" }
+ # Create directory that would hold the git repos
+ file { '/srv/ssd/zuul':
+ ensure => directory,
+ owner => 'jenkins',
+ group => 'jenkins',
+ mode => '2775',
+ require => Mount['/srv/ssd'],
+ }
+ file { '/srv/ssd/zuul/git':
+ ensure => directory,
+ owner => 'jenkins',
+ group => 'jenkins',
+ mode => '2775',
+ require => File['/srv/ssd/zuul'],
+ }
+
zuulwikimedia::instance { "zuul-production":
jenkins_server =>
'https://integration.wikimedia.org/ci',
jenkins_user => 'zuul-bot',
@@ -51,6 +68,7 @@
url_pattern =>
'https://integration.wikimedia.org/ci/job/{job.name}/{build.number}/console',
status_url => 'https://integration.wikimedia.org/zuul/',
git_branch => 'master',
+ git_dir => '/srv/ssd/zuul/git',
push_change_refs => false
}
diff --git a/manifests/zuul.pp b/manifests/zuul.pp
index 62d20b4..8350710 100644
--- a/manifests/zuul.pp
+++ b/manifests/zuul.pp
@@ -12,6 +12,7 @@
$url_pattern,
$status_url,
$git_branch='master',
+ $git_dir='/var/lib/zuul/git',
$push_change_refs
) {
@@ -30,6 +31,7 @@
url_pattern => $url_pattern,
status_url => $status_url,
git_branch => $git_branch,
+ git_dir => $git_dir,
push_change_refs => $push_change_refs,
}
--
To view, visit https://gerrit.wikimedia.org/r/58899
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibbd118f00bd8a76abcc33e203d0928f383b08040
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
