Ori.livneh has submitted this change and it was merged.

Change subject: PCC: Fix success/failure detection
......................................................................


PCC: Fix success/failure detection

Puppet always sets a nonzero exit code, so resort to cruder means of testing
for success or failure.

Change-Id: I5da84a5feb9da3080938d587abac6c86d849ad10
---
M utils/pcc
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/utils/pcc b/utils/pcc
index 883034b..7a7bf69 100755
--- a/utils/pcc
+++ b/utils/pcc
@@ -150,7 +150,8 @@
 
 # Puppet's exit code is not always meaningful, so we grep the output
 # for failures before declaring victory.
-ok = build.is_good() and not re.search(r'[1-9]\d* FAIL', output)
+ok = ('Run finished' in output and not
+      re.search(r'[1-9]\d* (ERROR|FAIL)', output))
 if ok:
     print green('SUCCESS')
     sys.exit(0)

-- 
To view, visit https://gerrit.wikimedia.org/r/298252
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5da84a5feb9da3080938d587abac6c86d849ad10
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to