jenkins-bot has submitted this change and it was merged.

Change subject: Work around cucumber pretty formater bug
......................................................................


Work around cucumber pretty formater bug

Bug: T110510
Change-Id: I21997a21e9b19f4de2295aeb264151d002f45e13
---
M jjb/macro-browsertests.yaml
1 file changed, 6 insertions(+), 1 deletion(-)

Approvals:
  Hashar: Looks good to me, but someone else must approve
  JanZerebecki: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/jjb/macro-browsertests.yaml b/jjb/macro-browsertests.yaml
index 2e5e76c..317c615 100644
--- a/jjb/macro-browsertests.yaml
+++ b/jjb/macro-browsertests.yaml
@@ -99,12 +99,17 @@
               cp "$WORKSPACE/tests/browser/config/config_ci.yml" 
"$WORKSPACE/tests/browser/config/config.yml"
           fi
 
+          # workaround for T110510
+          pretty="--format pretty"
+          if [ "wikidata.beta.wmflabs.org" = "{mediawiki_url}" ]; then
+            pretty=""
+          fi
           # run tests
           "$WORKSPACE"/vendor/bin/bundle exec cucumber \
             --backtrace \
             --color \
             --verbose \
-            --format pretty \
+            $pretty \
             --format Cucumber::Formatter::Sauce \
             --out "$WORKSPACE/log/junit" \
             --tags $CUCUMBER_PARAMETER \

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I21997a21e9b19f4de2295aeb264151d002f45e13
Gerrit-PatchSet: 3
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: JanZerebecki <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: JanZerebecki <[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

Reply via email to