Index: tools/bots/linux_distribution_support.py |
=================================================================== |
--- tools/bots/linux_distribution_support.py (revision 35568) |
+++ tools/bots/linux_distribution_support.py (working copy) |
@@ -70,18 +70,18 @@ |
with bot.BuildStep('Validating linux system'): |
print 'Validating that we are on %s' % build_info.builder_tag |
- args = ['uname', '-a'] |
+ args = ['cat', '/etc/os-release'] |
(stdout, stderr, exitcode) = bot_utils.run(args) |
if exitcode != 0: |
print "Could not find linux system, exiting" |
sys.exit(1) |
if build_info.builder_tag == "debian_wheezy": |
- if not "Debian" in stdout: |
+ if not "wheezy" in stdout: |
print "Trying to build debian bits on a non debian system" |
sys.exit(1) |
if build_info.builder_tag == "ubuntu_precise": |
- if not "Ubuntu" in stdout: |
+ if not "precise" in stdout: |
print "Trying to build ubuntu bits on a non ubuntu system" |
sys.exit(1) |
@@ -99,10 +99,10 @@ |
with bot.BuildStep('Upload artifacts'): |
bot_name, _ = bot.GetBotName() |
channel = bot_utils.GetChannelFromName(bot_name) |
- if channel != bot_utils.Channel.BLEEDING_EDGE: |
- ArchiveArtifacts(tarfile, builddir, channel, build_info.builder_tag) |
- else: |
- print 'Not uploading artifacts on bleeding edge' |
+# if channel != bot_utils.Channel.BLEEDING_EDGE: |
+ ArchiveArtifacts(tarfile, builddir, channel, build_info.builder_tag) |
+# else: |
+# print 'Not uploading artifacts on bleeding edge' |
if __name__ == '__main__': |
# We pass in None for build_step to avoid building the sdk. |