Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/301120
Change subject: Fix up zuul layoutdiff
......................................................................
Fix up zuul layoutdiff
With the new Zuul version, the zuul.conf must have a gerrit connection
defined or the layout validation would bails out.
The layout diff capture all the output which masked a related stacktrace
causing the job to always show no difference.
Install Zuul from sources
Use the fixture layout
Change-Id: Id67d99b257feb28287c378fdad3c05112f61f4cf
---
M jjb/integration.yaml
1 file changed, 8 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/20/301120/1
diff --git a/jjb/integration.yaml b/jjb/integration.yaml
index dd5f7b4..7637e71 100644
--- a/jjb/integration.yaml
+++ b/jjb/integration.yaml
@@ -65,10 +65,15 @@
rm -fR log
mkdir -p log
- # FIXME change path whenever we have zuul packaged.
- /usr/bin/zuul-server -c <(echo '[zuul]') -t -l
"$WORKSPACE"/zuul/layout.yaml 2>log/current.txt
+ # Install zuul based on /test-requirements.txt and activate venv
+ tox -e py27 -v -v --notest
+ . .tox/py27/bin/activate
+ zuul-server --version
+
+ zuul-server -c tests/fixtures/zuul-dummy.conf -t -l
"$WORKSPACE"/zuul/layout.yaml 2>log/current.txt
git checkout HEAD^
- /usr/bin/zuul-server -c <(echo '[zuul]') -t -l
"$WORKSPACE"/zuul/layout.yaml 2>log/before.txt
+ zuul-server -c tests/fixtures/zuul-dummy.conf -t -l
"$WORKSPACE"/zuul/layout.yaml 2>log/before.txt
+
sed -i -e 's/^INFO:zuul.IndependentPipelineManager:Configured Pipeline
Manager /Pipeline: /' log/current.txt log/before.txt
function compress_logs() {{
--
To view, visit https://gerrit.wikimedia.org/r/301120
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id67d99b257feb28287c378fdad3c05112f61f4cf
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
