jenkins-bot has submitted this change and it was merged.
Change subject: Use pipeline name as context for Zuul diff
......................................................................
Use pipeline name as context for Zuul diff
Reviewing diff generated by integration-zuul-layoutdiff is quite
annoying since we have no idea which pipelines are being changed. GNU
diff has the ability to display the context based on a regular
expression, albeit it is limited to 40 characters.
Hijack the layout output:
-INFO:zuul.IndependentPipelineManager:Configured Pipeline Manager test
+Pipeline: test
Use GNU diff option --show-function-line='^Pipeline: ' to teach it that
is our context.
Change-Id: Iade99387875b78477f22166098ce97f0c7c56278
---
M jjb/integration.yaml
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
Hashar: Checked
JanZerebecki: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/jjb/integration.yaml b/jjb/integration.yaml
index 73ff577..26c9868 100644
--- a/jjb/integration.yaml
+++ b/jjb/integration.yaml
@@ -66,7 +66,8 @@
/usr/bin/zuul-server -c <(echo '[zuul]') -t -l
"$WORKSPACE"/zuul/layout.yaml 2>current.txt
git checkout HEAD^
/usr/bin/zuul-server -c <(echo '[zuul]') -t -l
"$WORKSPACE"/zuul/layout.yaml 2>before.txt
- colordiff -u before.txt current.txt
+ sed -i -e 's/^INFO:zuul.IndependentPipelineManager:Configured Pipeline
Manager /Pipeline: /' current.txt before.txt
+ colordiff --show-function-line='^Pipeline: ' -u before.txt current.txt
- job-template:
name: 'integration-jjb-config-diff'
--
To view, visit https://gerrit.wikimedia.org/r/247543
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iade99387875b78477f22166098ce97f0c7c56278
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Zfilipin <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
