the mock configuration files need to be managed by puppet. this module contains the configuration files themselves as well as the manifests to manage them. if this module is OK, then toplevel::slave::build::mock should include mockbuild instead of packages::mozilla::mock_mozilla

Comment on attachment 628571 [details] [diff] [review] mockbuild module Review of attachment 628571 [details] [diff] [review]: ----------------------------------------------------------------- Other than that detail, this looks fine, including the change to toplevel::slave::build::mock that you described. ::: modules/mockbuild/manifests/init.pp @@ +2,5 @@ > + include packages::mozilla::mock_mozilla > + file { > + "/etc/mock_mozilla/mozilla-f11-i386.cfg": > + require => Class["packages::mozilla::mock_mozilla"], > + ensure => present, This ensure isn't required - "present" is implied in the absence of anything else.

Comment on attachment 628571 [details] [diff] [review] mockbuild module Review of attachment 628571 [details] [diff] [review]: ----------------------------------------------------------------- Please also add owner => root, group => root to the file resources; this prevents spurious ownership changes when working in a puppet environment.

This will need documentation on https://wiki.mozilla.org/ReleaseEngineering/PuppetAgain/Modules, too.

Comment on attachment 628571 [details] [diff] [review] mockbuild module Review of attachment 628571 [details] [diff] [review]: ----------------------------------------------------------------- The centos6 configs are busted. ::: modules/mockbuild/files/mozilla-centos6-i386.cfg @@ +1,4 @@ > +config_opts['root'] = 'mozilla-centos6-i386' > +config_opts['target_arch'] = 'i686' > +config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64') > +config_opts['chroot_setup_cmd'] = 'groupinstall core development' This is not correct. It should be: config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' This configuration parameter is used to specify the minimal subset of the Fedora package collection to build a functioning environment. Extra packages should be installed after the root has been created. Ideally, specific packages should be named and installed with the buildbot configuration.

the merges the previous two patches, and adjusts the 'chroot_setup_cmd' for the centos environments to work around the fact we've lost the yum group information for the centos repos.

Comment on attachment 639093 [details] [diff] [review] mockbuild module It looks good to me. That being said I'm not that familiar with the mock environment, so perhaps someone more familiar with it should also review.

I had to land this bustage fix because the slaves starting failing in mock-init and deleting /home/cltbld/.ssh: diff --git a/modules/mockbuild/files/mozilla-centos6-i386.cfg b/modules/mockbuild/files/mozilla-centos6-i386.cfg index d2d319f..6f06461 100644 --- a/modules/mockbuild/files/mozilla-centos6-i386.cfg +++ b/modules/mockbuild/files/mozilla-centos6-i386.cfg @@ -14,8 +14,6 @@ config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/builds/hg-shared '/builds/hg-shared')) config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/tmp/.X11-unix', '/tmp/.X11-unix')) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/home/cltbld/.ssh', - '/home/mock_mozilla/.ssh')) # But lets still create somewhere for build data that is outside of the chroot # and survives the chroot being cleaned diff --git a/modules/mockbuild/files/mozilla-centos6-x86_64.cfg b/modules/mockbuild/files/mozilla-centos6-x86_64.cfg index 8849df3..4d269ce 100644 --- a/modules/mockbuild/files/mozilla-centos6-x86_64.cfg +++ b/modules/mockbuild/files/mozilla-centos6-x86_64.cfg @@ -14,8 +14,6 @@ config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/builds/hg-shared '/builds/hg-shared')) config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/tmp/.X11-unix', '/tmp/.X11-unix')) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/home/cltbld/.ssh', - '/home/mock_mozilla/.ssh')) # But lets still create somewhere for build data that is outside of the chroot # and survives the chroot being cleaned diff --git a/modules/mockbuild/files/mozilla-f16-i386.cfg b/modules/mockbuild/files/mozilla-f16-i386.cfg index 95bbf6c..a77ae06 100644 --- a/modules/mockbuild/files/mozilla-f16-i386.cfg +++ b/modules/mockbuild/files/mozilla-f16-i386.cfg @@ -11,8 +11,6 @@ config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/builds/ccache', '/builds/ccache')) config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/builds/hg-shared', '/builds/hg-shared')) -config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/home/cltbld/.ssh', - '/home/mock_mozilla/.ssh')) # But lets still create somewhere for build data that is outside of the chroot # and survives the chroot being cleaned config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/builds/mock_mozilla/%s/targetdata/' % config_opts['root'],

Properly bind mounting ssh keys is tracked in bug 770990.