Bug 1417603 - Don't upload mozscreenshots on integration branches. r=johannh
authorMatthew Noorenberghe <mozilla@noorenberghe.ca>
Fri, 15 Dec 2017 13:38:39 -0600
changeset 448329 ba3cfd3992b6dc346cec170aa29e7dd2c64851fc
parent 448328 99fe32dcca1cbec4ff8ef31249a4878330b57e85
child 448330 3eab9fd44dda8e939027988572ef76270da35cce
push id8527
push userCallek@gmail.com
push dateThu, 11 Jan 2018 21:05:50 +0000
treeherdermozilla-beta@95342d212a7a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjohannh
bugs1417603
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1417603 - Don't upload mozscreenshots on integration branches. r=johannh MozReview-Commit-ID: Cx8n68j22nL
browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm
@@ -50,17 +50,18 @@ this.TestRunner = {
    * Load specified sets, execute all combinations of them, and capture screenshots.
    */
   async start(setNames, jobName = null) {
     let subDirs = ["mozscreenshots",
                    (new Date()).toISOString().replace(/:/g, "-") + "_" + Services.appinfo.OS];
     let screenshotPath = FileUtils.getFile("TmpD", subDirs).path;
 
     const MOZ_UPLOAD_DIR = env.get("MOZ_UPLOAD_DIR");
-    if (MOZ_UPLOAD_DIR) {
+    const MOZ_SOURCE_REPO = env.get("MOZ_SOURCE_REPO");
+    if (MOZ_UPLOAD_DIR && !MOZ_SOURCE_REPO.includes("/integration/")) {
       screenshotPath = MOZ_UPLOAD_DIR;
     }
 
     this.mochitestScope.info(`Saving screenshots to: ${screenshotPath}`);
 
     let screenshotPrefix = Services.appinfo.appBuildID;
     if (jobName) {
       screenshotPrefix += "-" + jobName;