revert separate stages for now

2 jobs for master in 1 minute and 40 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #40198
Linux
test-2.7

00:01:15

passed #40197
Linux
test-3.5

00:01:40