Yuvipanda has submitted this change and it was merged.
Change subject: tools: Stop bigbrother attempting to look at webservice jobs
......................................................................
tools: Stop bigbrother attempting to look at webservice jobs
Service Manifests deal with this much better.
Change-Id: I4fa8be5c6dfc4fa4fff087239e67e75c4bcb5d1d
---
M modules/toollabs/files/bigbrother
1 file changed, 2 insertions(+), 25 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
Merlijn van Deen: Looks good to me, but someone else must approve
BBlack: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/toollabs/files/bigbrother
b/modules/toollabs/files/bigbrother
index b4ca696..7b5ab58 100755
--- a/modules/toollabs/files/bigbrother
+++ b/modules/toollabs/files/bigbrother
@@ -80,31 +80,8 @@
my $start;
if (m/^\s*(?:#.*)?$/) { # Ignore empty lines and comments.
next;
- } elsif(m/^webservice(:?\s+-([a-z]+(?:-[a-z]+)*))?$/) {
- my $name = $2 // "lighttpd";
- unless($username =~ m/^tools\.(.*)$/) {
- ulog $username, 'error', "$rcfile:$line: unable to figure
out webgrid name! (not possible)";
- next;
- }
- $expect = "$name-$1";
- $start = "/usr/local/bin/webservice2 --release precise $name
start";
- } elsif(m/^webservice2(:?\s+-([a-z]+(?:-[a-z]+)*))?$/) {
- my $name = $2 // "lighttpd";
- unless($username =~ m/^tools\.(.*)$/) {
- ulog $username, 'error', "$rcfile:$line: unable to figure
out webgrid name! (not possible)";
- next;
- }
- $expect = "$name-$1";
- $start = "/usr/local/bin/webservice2 $name start";
- }
elsif(m/^webservice(:?\s+(--release\s+[a-z]+))?(:?\s+([a-z]+(?:-[a-z]+)*))?$/) {
- my $rel = $2 // '';
- my $name = $3 // "lighttpd";
- unless($username =~ m/^tools\.(.*)$/) {
- ulog $username, 'error', "$rcfile:$line: unable to figure
out webgrid name! (not possible)";
- next;
- }
- $expect = "$name-$1";
- $start = "/usr/local/bin/webservice2 $rel $name start";
+ } elsif(m/^webservice/) {
+ next; # Ignore webservice lines, they are taken care of by
service manifests
} elsif(m/^jstart\s+-N\s+(\S+)\s+(.*)$/) {
$expect = $1;
$start = "/usr/bin/jstart -N '$expect' $2";
--
To view, visit https://gerrit.wikimedia.org/r/214766
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4fa8be5c6dfc4fa4fff087239e67e75c4bcb5d1d
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Merlijn van Deen <valhall...@arctus.nl>
Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: coren <mpellet...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
