1251381 - Switch gtest to riding the 46 train

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[Phil Ringnalda (:philor)]

At the time of https://dxr.mozilla.org/build-central/source/buildbot-configs/mozilla-tests/config.py#3036 we thought the separate gtest job was going to ride the 45 train, but it turned out not to make it until 46, and our theory that we could just hide it on beta and then release ignored the fact that 45 is an esr branch, so now we're running it permared on esr45, and will until either esr45 dies or we change that 45 to a 46.

Comment 1

[Nick Thomas [:nthomas] (UTC+12)]

Attachment: Change in builder list

This isn't as easy as just doing
diff --git a/mozilla-tests/config.py b/mozilla-tests/config.py
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -3049,13 +3049,13 @@ for branch in BRANCHES.keys():
 # Gtests run from the test package
 for platform in PLATFORMS.keys():
     if platform not in ['linux', 'linux64', 'linux64-asan', 'linux64-tsan', 'linux64-cc',
                         'macosx64', 'win32', 'win64']:
         continue

-    for name, branch in items_at_least(BRANCHES, 'gecko_version', 45):
+    for name, branch in items_at_least(BRANCHES, 'gecko_version', 46):
         for slave_platform in PLATFORMS[platform]['slave_platforms']:

             # Not stable on windows XP
             if slave_platform in ['xp-ix', 'win10_64', 'yosemite', 'yosemite_r7']:
                 continue

because a lot of builders get added to esr45 and beta (see attachment). Do you have more context, or know who does ?

Comment 2

[Justin Wood (:Callek)]

Looks like that was from Kim's change on https://hg.mozilla.org/build/buildbot-configs/rev/5a8e6fe0b6ce and specifically the fact that we `= GTEST` rather than `+= GTEST` for one of the branches. Which means we're likely 'hiding' those other tests by accident...

Comment 3

[Kim Moir [:kmoir] ET]

It was implemented like this

elif (platform in ['linux64', 'linux64-tsan', 'linux64-cc'] and slave_platform in ['ubuntu64_vm_lnx_large']) or (platform in ['linux64-asan'] and slave_platform in ['ubuntu64-asan_vm_lnx_large']):
+                    BRANCHES[name]['platforms'][platform][slave_platform]['debug_unittest_suites'] = GTEST

because we wanted to only have gtests run on this larger instance type for linux builds

Comment 4

[Phil Ringnalda (:philor)]

What does the builder diff look like if along with #3036 you also change https://dxr.mozilla.org/build-central/source/buildbot-configs/mozilla-tests/config.py#2999 to 46?

Comment 5

[Chris AtLee [:catlee]]

Yeah, that looks much better. What does that variable do!?  Here's the builder diff:

--- old.txt     2016-02-26 10:25:01.389429482 -0800
+++ new.txt     2016-02-26 10:52:15.789500717 -0800
@@ -3198,7 +3198,6 @@
 Ubuntu ASAN VM large 12.04 x64 fx-team opt test gtest ScriptFactory
 Ubuntu ASAN VM large 12.04 x64 jamun opt test gtest ScriptFactory
 Ubuntu ASAN VM large 12.04 x64 mozilla-aurora opt test gtest ScriptFactory
-Ubuntu ASAN VM large 12.04 x64 mozilla-beta opt test gtest ScriptFactory
 Ubuntu ASAN VM large 12.04 x64 mozilla-central opt test gtest ScriptFactory
 Ubuntu ASAN VM large 12.04 x64 mozilla-inbound opt test gtest ScriptFactory
 Ubuntu ASAN VM large 12.04 x64 oak opt test gtest ScriptFactory
@@ -5790,15 +5789,9 @@
 Ubuntu VM large 12.04 x64 mozilla-aurora debug test gtest ScriptFactory
 Ubuntu VM large 12.04 x64 mozilla-aurora opt test gtest ScriptFactory
 Ubuntu VM large 12.04 x64 mozilla-aurora pgo test gtest ScriptFactory
-Ubuntu VM large 12.04 x64 mozilla-beta debug test gtest ScriptFactory
-Ubuntu VM large 12.04 x64 mozilla-beta opt test gtest ScriptFactory
-Ubuntu VM large 12.04 x64 mozilla-beta pgo test gtest ScriptFactory
 Ubuntu VM large 12.04 x64 mozilla-central debug test gtest ScriptFactory
 Ubuntu VM large 12.04 x64 mozilla-central opt test gtest ScriptFactory
 Ubuntu VM large 12.04 x64 mozilla-central pgo test gtest ScriptFactory
-Ubuntu VM large 12.04 x64 mozilla-esr45 debug test gtest ScriptFactory
-Ubuntu VM large 12.04 x64 mozilla-esr45 opt test gtest ScriptFactory
-Ubuntu VM large 12.04 x64 mozilla-esr45 pgo test gtest ScriptFactory
 Ubuntu VM large 12.04 x64 mozilla-inbound debug test gtest ScriptFactory
 Ubuntu VM large 12.04 x64 mozilla-inbound opt test gtest ScriptFactory
 Ubuntu VM large 12.04 x64 mozilla-inbound pgo test gtest ScriptFactory

Comment 7

[Chris AtLee [:catlee]]

Attachment: gtest45.diff

I'm not really sure what this ride_trains variable does, but it seems to fix up this issue nicely.

Comment 8

[Chris AtLee [:catlee]]

https://hg.mozilla.org/build/buildbot-configs/rev/2a06d32c80b9be3b9fed13a0d89e6f37e6b0dd25
Bug 1251381: Switch gtests to riding 46 r=kmoir

Comment 9

[Chris AtLee [:catlee]]

I think this got deployed