[llvm-commits] [zorg] r169937 - /zorg/trunk/zorg/buildbot/Artifacts.py

[Galina Kistanova]

Still not fixed. Please see traceback below.

Thanks

Galina


Traceback (most recent call last):
  File "/opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/buildbot/scripts/checkconfig.py",
line 37, in loadcfg
    checkOnly=True)
  File "/opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/buildbot/master.py",
line 579, in loadConfig
    d.addCallback(do_load)
  File "/opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/twisted/internet/defer.py",
line 298, in addCallback
    callbackKeywords=kw)
  File "/opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/twisted/internet/defer.py",
line 287, in addCallbacks
    self._runCallbacks()
--- <exception caught here> ---
  File "/opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/twisted/internet/defer.py",
line 545, in _runCallbacks
    current.result = callback(current.result, *args, **kw)
  File "/opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/buildbot/master.py",
line 226, in do_load
    exec f in localDict
  File "/Volumes/Macintosh
HD2/llvm.buildmaster/zorg/buildbot/osuosl/master/master.cfg", line 17,
in <module>
    import config
  File "/Volumes/Macintosh
HD2/llvm.buildmaster/zorg/buildbot/osuosl/master/config/__init__.py",
line 1, in <module>
    import builders
  File "/Volumes/Macintosh
HD2/llvm.buildmaster/zorg/buildbot/osuosl/master/config/builders.py",
line 1, in <module>
    from zorg.buildbot.builders import ClangBuilder
  File "/Volumes/Macintosh
HD2/llvm.buildmaster/zorg/zorg/buildbot/builders/ClangBuilder.py",
line 10, in <module>
    from zorg.buildbot.Artifacts import GetCompilerArtifacts, uploadArtifacts
  File "/Volumes/Macintosh
HD2/llvm.buildmaster/zorg/zorg/buildbot/Artifacts.py", line 20, in
<module>
    is_production = set_config_option('Master Options', 'is_production')
  File "/Volumes/Macintosh
HD2/llvm.buildmaster/zorg/zorg/buildbot/PhasedBuilderUtils.py", line
266, in set_config_option
    if config.options.has_option(section, option):
exceptions.AttributeError: 'module' object has no attribute 'options'





On Tue, Dec 11, 2012 at 4:18 PM, David Dean <david_dean at apple.com> wrote:
> Author: ddean
> Date: Tue Dec 11 18:18:51 2012
> New Revision: 169937
>
> URL: http://llvm.org/viewvc/llvm-project?rev=169937&view=rev
> Log:
> Use safer method for getting options from local.cfg
>
> Modified:
>     zorg/trunk/zorg/buildbot/Artifacts.py
>
> Modified: zorg/trunk/zorg/buildbot/Artifacts.py
> URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/Artifacts.py?rev=169937&r1=169936&r2=169937&view=diff
> ==============================================================================
> --- zorg/trunk/zorg/buildbot/Artifacts.py (original)
> +++ zorg/trunk/zorg/buildbot/Artifacts.py Tue Dec 11 18:18:51 2012
> @@ -1,39 +1,37 @@
>  import buildbot
>  import config
> -import warnings
>
>  from buildbot.steps.shell import WithProperties
>  from zorg.buildbot.PhasedBuilderUtils import setProperty, determine_phase_id
> +from zorg.buildbot.PhasedBuilderUtils import set_config_option
>
>  # Get some parameters about where to upload and download results from.
> -
>  # Set up defaults assuming we aren't in  production mode which
>  # assume that we are just using a local user.
>  import getpass
>  rsync_user = getpass.getuser()
>  master_name = 'localhost'
> +master_protocol = 'http'
>  base_download_url = 'http://%s/~%s/artifacts' % (master_name, rsync_user)
>  package_url = 'http://%s/~%s/packages' % (master_name, rsync_user)
> +base_rsync_path = '~/artifacts'
> +curl_flags = '-svo'
>
> -if config.options.has_option('Master Options', 'is_production'):
> -    is_production = config.options.get('Master Options', 'is_production')
> -    if is_production:
> -        rsync_user = config.options.get('Master Options', 'rsync_user')
> -        master_name = config.options.get('Master Options', 'master_name')
> -        master_protocol = config.options.get('Master Options', 'master_protocol')
> -        base_download_url = '%s://%s/artifacts' % (master_protocol, master_name)
> -        package_url = 'http://smooshlab.apple.com/packages'
> -else:
> -    warnings.warn('Please update your local.cfg file')
> -
> -base_rsync_path = rsync_user + '@' + master_name + ':'
> -# TODO: Fix this up. Quick hack to get smooshbase up.
> -if master_name == "smooshbase.apple.com":
> -    base_rsync_path += '/var/www/root/artifacts'
> -    curl_flags = '-ksvo'
> -else:
> -    base_rsync_path += '~/artifacts'
> -    curl_flags = '-svo'
> +is_production = set_config_option('Master Options', 'is_production')
> +if is_production:
> +    rsync_user = set_config_option('Master Options', 'rsync_user',
> +                                   'buildmaster')
> +    master_name = set_config_option('Master Options', 'master_name',
> +                                    'localhost')
> +    master_protocol = set_config_option('Master Options',
> +                                        'master_protocol', 'http')
> +    base_download_url = '%s://%s/artifacts' % (master_protocol, master_name)
> +    package_url = set_config_option('Master Options', 'package_url',
> +                                    'http://localhost/~buildmaster/packages')
> +    base_rsync_path = set_config_option('Master Options', 'base_rsync_path',
> +                                        '~/artifacts')
> +    master_name = set_config_option('Master Options', 'curl_flags',
> +                                    '-svo')
>
>  # This method is used in determining the name of a given compiler archive
>  def _determine_compiler_kind(props):
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits