Confirmed users
4,293
edits
| Line 140: | Line 140: | ||
mock_mozilla -r mozilla-centos6-x86_64 --cwd /builds/slave --unpriv --shell 'PATH="/tools/buildbot/bin:/usr/local/bin:/usr/lib/ccache:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/tools/git/bin:/tools/python27/bin:/tools/python27-mercurial/bin:/home/cltbld/bin" bash' | mock_mozilla -r mozilla-centos6-x86_64 --cwd /builds/slave --unpriv --shell 'PATH="/tools/buildbot/bin:/usr/local/bin:/usr/lib/ccache:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/tools/git/bin:/tools/python27/bin:/tools/python27-mercurial/bin:/home/cltbld/bin" bash' | ||
# then as above | # then as above | ||
</pre> | |||
Results, this diff is expected as we want the updated beta build to keep these settings: | |||
<pre> | |||
succeeded | |||
calling QuitProgressUI | |||
diff -r source/firefox/defaults/pref/channel-prefs.js target/firefox/defaults/pref/channel-prefs.js | |||
1c1 | |||
< //@line 2 "/builds/slave/rel-m-beta-l64_bld-00000000000/build/browser/app/profile/channel-prefs.js" | |||
--- | |||
> //@line 2 "/builds/slave/rel-m-rel-l64_bld-000000000000/build/browser/app/profile/channel-prefs.js" | |||
6c6 | |||
< pref("app.update.channel", "beta"); | |||
--- | |||
> pref("app.update.channel", "release"); | |||
diff -r source/firefox/update-settings.ini target/firefox/update-settings.ini | |||
5c5 | |||
< ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-beta,firefox-mozilla-release | |||
--- | |||
> ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-release | |||
</pre> | </pre> | ||