[Buildbot-commits] [buildbot/buildbot] 1d8e00: Merge remote-tracking branch 'org/buildbot-0.8.8' ...

Fri Jul 5 22:10:00 UTC 2013

  Branch: refs/heads/nine
  Home:   https://github.com/buildbot/buildbot
  Commit: 1d8e0057ea8f8ef9fc61db10cf6240a63112b3c7
      https://github.com/buildbot/buildbot/commit/1d8e0057ea8f8ef9fc61db10cf6240a63112b3c7
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M common/generate_buildbot_api_documentation.sh
    M master/buildbot/buildslave/__init__.py
    M master/buildbot/db/schedulers.py
    M master/buildbot/master.py
    M master/buildbot/process/botmaster.py
    M master/buildbot/process/build.py
    M master/buildbot/process/builder.py
    M master/buildbot/process/buildrequestdistributor.py
    M master/buildbot/process/buildstep.py
    M master/buildbot/schedulers/forcesched.py
    M master/buildbot/scripts/runner.py
    M master/buildbot/status/web/builder.py
    M master/buildbot/status/web/grid.py
    M master/buildbot/status/words.py
    M master/buildbot/steps/python_twisted.py
    M master/buildbot/steps/slave.py
    M master/buildbot/steps/source/git.py
    M master/buildbot/steps/source/oldsource.py
    M master/buildbot/steps/source/repo.py
    M master/buildbot/test/fake/fakedb.py
    M master/buildbot/test/unit/test_process_build.py
    M master/buildbot/test/unit/test_process_builder.py
    M master/buildbot/test/unit/test_process_buildrequestdistributor_BuildRequestDistributor.py
    M master/buildbot/test/unit/test_scripts_restart.py
    M master/buildbot/test/unit/test_scripts_runner.py
    M master/buildbot/test/unit/test_status_words.py
    M master/buildbot/test/unit/test_steps_master.py
    M master/buildbot/test/unit/test_steps_slave.py
    M master/buildbot/test/unit/test_steps_source_svn.py
    M master/buildbot/test/unit/test_util_maildir.py
    M master/buildbot/util/maildir.py
    M master/docs/manual/cfg-builders.rst
    M master/docs/manual/cfg-buildsteps.rst
    M master/docs/manual/cfg-schedulers.rst
    M master/docs/manual/installation.rst
    M master/docs/relnotes/0.8.7.rst
    M master/docs/tutorial/fiveminutes.rst
    M master/docs/tutorial/further.rst
    M slave/buildslave/scripts/runner.py

  Log Message:
  -----------
  Merge remote-tracking branch 'org/buildbot-0.8.8' into buildbot-0.8.8

  Commit: eb8526ce01be362032ca345f845f0042e9785cdd
      https://github.com/buildbot/buildbot/commit/eb8526ce01be362032ca345f845f0042e9785cdd
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M master/buildbot/process/build.py
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Reintroduce deprecated `workdir` property.

It is unfortunatley named, but dropping it now doesn't provide a clear
migration path. Supporting both for at least a version allows smoother
migration.

  Commit: 4ea0e5fd6c579d6b85421a774ea00efa731c2e1a
      https://github.com/buildbot/buildbot/commit/4ea0e5fd6c579d6b85421a774ea00efa731c2e1a
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2013-06-06 (Thu, 06 Jun 2013)

  Changed paths:
    M master/buildbot/scripts/base.py
    M master/buildbot/scripts/checkconfig.py
    M master/buildbot/scripts/upgrade_master.py
    M master/buildbot/test/unit/test_scripts_base.py
    M master/buildbot/test/unit/test_scripts_checkconfig.py

  Log Message:
  -----------
  Rework locating config file for checkconfig and upgrade-master.

This changes the logic of checkconfig so that,
1. If a file is passed, that file is used.
2. If a directory is passed containing `buildbot.tac`, that file is
   loaded and `configfile` is defined there, that file is used.
3. If `buildbot.tac` doesn't exist, or doesn't define `configfile`,
   `master.cfg` from that directory is used.

The logic for upgrade-master is similar, except only directories are
supported, so (1) is skipped.

  Commit: 5fd5273241de3e1e3a93cfe259d6cc882bf796a4
      https://github.com/buildbot/buildbot/commit/5fd5273241de3e1e3a93cfe259d6cc882bf796a4
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2013-06-06 (Thu, 06 Jun 2013)

  Changed paths:
    M master/buildbot/steps/shell.py
    M master/buildbot/test/unit/test_steps_shell.py

  Log Message:
  -----------
  Use twisted.python.deprecate.deprecatedModuleAttribute to deprecate SetProperty.

  Commit: 6b06d23eb425b00fe96c8e98633ff77d98b58d54
      https://github.com/buildbot/buildbot/commit/6b06d23eb425b00fe96c8e98633ff77d98b58d54
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M master/buildbot/buildslave/__init__.py
    A master/buildbot/buildslave/base.py
    A master/buildbot/buildslave/ec2.py
    A master/buildbot/buildslave/libvirt.py
    M master/buildbot/buildslave/openstack.py
    M master/buildbot/ec2buildslave.py
    M master/buildbot/libvirtbuildslave.py
    R master/buildbot/test/unit/test_buildslave.py
    A master/buildbot/test/unit/test_buildslave_base.py
    A master/buildbot/test/unit/test_buildslave_libvirt.py
    R master/buildbot/test/unit/test_libvirtbuildslave.py
    M master/docs/manual/cfg-buildslaves.rst
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Move buildslave code around to match organization of openstack latent slave.

  Commit: 18533b22faba8e69246e65e54e7cee0e0466621d
      https://github.com/buildbot/buildbot/commit/18533b22faba8e69246e65e54e7cee0e0466621d
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M master/buildbot/scripts/checkconfig.py
    M master/buildbot/scripts/upgrade_master.py
    M master/buildbot/test/unit/test_scripts_checkconfig.py

  Log Message:
  -----------
  Report `SyntaxError` or `ImportError` from `checkconfig` and `upgrade-master`.

  Commit: 479ab7f275d96b1814db93a2e69e70033b5fefc0
      https://github.com/buildbot/buildbot/commit/479ab7f275d96b1814db93a2e69e70033b5fefc0
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M master/buildbot/scripts/base.py
    M master/buildbot/scripts/checkconfig.py
    M master/buildbot/scripts/upgrade_master.py
    M master/buildbot/test/unit/test_scripts_base.py
    M master/buildbot/test/unit/test_scripts_checkconfig.py

  Log Message:
  -----------
  Merge 'locate-config': Rework locating config file for checkconfig and upgrade-master.

This changes the logic of checkconfig so that,
1. If a file is passed, that file is used.
2. If a directory is passed containing buildbot.tac, that file is
loaded and configfile is defined there, that file is used.
3. If buildbot.tac doesn't exist, or doesn't define configfile,
master.cfg from that directory is used.

The logic for upgrade-master is similar, except only directories are
supported, so (1) is skipped.

  Commit: 1465f9d26e4dd2edd75703706ed57eb6f75d012e
      https://github.com/buildbot/buildbot/commit/1465f9d26e4dd2edd75703706ed57eb6f75d012e
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M master/buildbot/scripts/checkconfig.py
    M master/buildbot/scripts/upgrade_master.py

  Log Message:
  -----------
  Fix python2.5 syntax errors.

  Commit: c7fc9806c3361267c37dcf896be4ce701fd60301
      https://github.com/buildbot/buildbot/commit/c7fc9806c3361267c37dcf896be4ce701fd60301
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-07-05 (Fri, 05 Jul 2013)

  Changed paths:
    M master/buildbot/config.py
    M master/buildbot/test/unit/test_config.py

  Log Message:
  -----------
  Don't check that builders are defined in multi-master mode

This fixes an error identified by Yassert LEBON
<yasser.lebon at gmail.com>.

  Commit: 99e57e6577dca2361ac3fe1f36f0cad19387c10f
      https://github.com/buildbot/buildbot/commit/99e57e6577dca2361ac3fe1f36f0cad19387c10f
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-07-05 (Fri, 05 Jul 2013)

  Changed paths:
    M master/buildbot/buildslave/__init__.py
    A master/buildbot/buildslave/base.py
    A master/buildbot/buildslave/ec2.py
    A master/buildbot/buildslave/libvirt.py
    M master/buildbot/buildslave/openstack.py
    M master/buildbot/config.py
    M master/buildbot/ec2buildslave.py
    M master/buildbot/libvirtbuildslave.py
    M master/buildbot/process/build.py
    M master/buildbot/scripts/base.py
    M master/buildbot/scripts/checkconfig.py
    M master/buildbot/scripts/upgrade_master.py
    M master/buildbot/steps/shell.py
    R master/buildbot/test/unit/test_buildslave.py
    A master/buildbot/test/unit/test_buildslave_base.py
    A master/buildbot/test/unit/test_buildslave_libvirt.py
    M master/buildbot/test/unit/test_config.py
    R master/buildbot/test/unit/test_libvirtbuildslave.py
    M master/buildbot/test/unit/test_scripts_base.py
    M master/buildbot/test/unit/test_scripts_checkconfig.py
    M master/buildbot/test/unit/test_steps_shell.py
    M master/docs/manual/cfg-buildslaves.rst
    M master/docs/relnotes/0.8.8.rst

  Log Message:
  -----------
  Merge branch 'buildbot-0.8.8'

  Commit: 3de2de4bca9bf81463ac74b776e8696d2a3ac6cd
      https://github.com/buildbot/buildbot/commit/3de2de4bca9bf81463ac74b776e8696d2a3ac6cd
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-07-05 (Fri, 05 Jul 2013)

  Changed paths:
    M master/buildbot/buildslave/__init__.py
    A master/buildbot/buildslave/base.py
    A master/buildbot/buildslave/ec2.py
    A master/buildbot/buildslave/libvirt.py
    M master/buildbot/buildslave/openstack.py
    M master/buildbot/config.py
    M master/buildbot/ec2buildslave.py
    M master/buildbot/libvirtbuildslave.py
    M master/buildbot/process/build.py
    M master/buildbot/scripts/base.py
    M master/buildbot/scripts/checkconfig.py
    M master/buildbot/scripts/upgrade_master.py
    M master/buildbot/steps/shell.py
    R master/buildbot/test/unit/test_buildslave.py
    A master/buildbot/test/unit/test_buildslave_base.py
    A master/buildbot/test/unit/test_buildslave_libvirt.py
    M master/buildbot/test/unit/test_config.py
    R master/buildbot/test/unit/test_libvirtbuildslave.py
    M master/buildbot/test/unit/test_scripts_base.py
    M master/buildbot/test/unit/test_scripts_checkconfig.py
    M master/buildbot/test/unit/test_steps_shell.py
    M master/docs/manual/cfg-buildslaves.rst
    M master/docs/relnotes/0.8.8.rst

  Log Message:
  -----------
  Merge branch 'master' into nine

Compare: https://github.com/buildbot/buildbot/compare/d326f4f17fe6...3de2de4bca9b