Lcarr has submitted this change and it was merged.
Change subject: zuul: let us change branch of zuul-config repo
......................................................................
zuul: let us change branch of zuul-config repo
The Zuul configuration is hosted in integration/zuul-config. Since the
production and labs environnements are entirely different, this patch
let us pass the branch of zuul-config we want to initially checkout.
The new parameter being config_git_branch (default: master). For labs
the branch is 'labs'.
Change-Id: Ide5f94ff6d2f75b845246d66a1c6554038bdc1f5
---
M manifests/role/zuul.pp
M manifests/zuul.pp
2 files changed, 4 insertions(+), 1 deletion(-)
Approvals:
Lcarr: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/zuul.pp b/manifests/role/zuul.pp
index 6db8bd7..9423370 100644
--- a/manifests/role/zuul.pp
+++ b/manifests/role/zuul.pp
@@ -35,6 +35,7 @@
gerrit_user => 'jenkins',
url_pattern =>
'http://integration.wmflabs.org/ci/job/{job.name}/{build.number}/console',
status_url => 'http://integration.wmflabs.org/zuul/status',
+ config_git_branch => 'labs',
git_branch => 'labs',
git_dir => $role::zuul::configuration::zuul_git_dir,
push_change_refs => false,
@@ -77,6 +78,7 @@
gerrit_user => 'jenkins-bot',
url_pattern =>
'https://integration.wikimedia.org/ci/job/{job.name}/{build.number}/console',
status_url => 'https://integration.wikimedia.org/zuul/',
+ config_git_branch => 'master',
git_branch => 'master',
git_dir => $role::zuul::configuration::zuul_git_dir,
push_change_refs => false,
diff --git a/manifests/zuul.pp b/manifests/zuul.pp
index 93c7fba..09b2fef 100644
--- a/manifests/zuul.pp
+++ b/manifests/zuul.pp
@@ -13,6 +13,7 @@
$gerrit_user,
$url_pattern,
$status_url,
+ $config_git_branch='master',
$git_branch='master',
$git_dir='/var/lib/zuul/git',
$push_change_refs,
@@ -56,7 +57,7 @@
group => jenkins,
mode => 0775,
origin =>
"https://gerrit.wikimedia.org/r/p/integration/zuul-config.git";,
- branch => "master",
+ branch => $config_git_branch,
}
# Logging configuration
--
To view, visit https://gerrit.wikimedia.org/r/98155
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ide5f94ff6d2f75b845246d66a1c6554038bdc1f5
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Lcarr <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
