Adding trybots for Periodic and PerCommit Housekeeper

master/skia_master_scripts/housekeeping_percommit_factory.py

Index: master/skia_master_scripts/housekeeping_percommit_factory.py
===================================================================
--- master/skia_master_scripts/housekeeping_percommit_factory.py	(revision 7935)
+++ master/skia_master_scripts/housekeeping_percommit_factory.py	(working copy)
@@ -49,61 +49,65 @@
                  'CC=`which clang` make -j30'),
         description='ClangCompile')
 
-    # Generate and upload Buildbot Pydoc documentation.
-    buildbot_pydoc_actual_svn_baseurl = '%s/%s' % (AUTOGEN_SVN_BASEURL,
-                                                   'buildbot-docs')
-    # pylint: disable=W0212
-    update_buildbot_pydoc_path = self.TargetPathJoin(
-        self._skia_cmd_obj._local_slave_script_dir, 'update-buildbot-pydoc.sh')
-    buildbot_pydoc_working_dir = self.TargetPathJoin(
-        tempfile.gettempdir(), 'buildbot-docs')
-    # Cleanup the previous (if any) buildbot pydoc working dir.
-    self._skia_cmd_obj.AddRunCommand(
-        command='rm -rf %s' % buildbot_pydoc_working_dir,
-        description='CleanupBuildbotPydoc')
-    # Generate Buildbot Pydoc documentation.
-    self._skia_cmd_obj.AddRunCommand(
-        command='BUILDBOT_PYDOC_TEMPDIR=%s bash %s' % (
-            buildbot_pydoc_working_dir, update_buildbot_pydoc_path),
-        description='UpdateBuildbotPydoc')
-    if self._do_upload_results:
-      # Upload Buildbot Pydoc.
-      self._skia_cmd_obj.AddMergeIntoSvn(
-          source_dir_path=self.TargetPathJoin(
-              buildbot_pydoc_working_dir, 'buildbot-docs'),
-          dest_svn_url=buildbot_pydoc_actual_svn_baseurl,
-          merge_dir_path=os.path.join(buildbot_pydoc_working_dir, 'merge'),
-          svn_username_file=self._autogen_svn_username_file,
-          svn_password_file=self._autogen_svn_password_file,
-          commit_message=WithProperties(
-              'UploadBuildbotPydoc of r%%(%s:-)s on %s' % (
-                  'revision', self._builder_name)),
-          description='UploadBuildbotPydoc')
+    if not self._do_patch_step:  # Do not run Pydoc & Doxygen steps if try job.
+      # Generate and upload Buildbot Pydoc documentation.
+      buildbot_pydoc_actual_svn_baseurl = '%s/%s' % (AUTOGEN_SVN_BASEURL,
+                                                     'buildbot-docs')
+      # pylint: disable=W0212
+      update_buildbot_pydoc_path = self.TargetPathJoin(
+          self._skia_cmd_obj._local_slave_script_dir,
+          'update-buildbot-pydoc.sh')
+      buildbot_pydoc_working_dir = self.TargetPathJoin(
+          tempfile.gettempdir(), 'buildbot-docs')
+      # Cleanup the previous (if any) buildbot pydoc working dir.
+      self._skia_cmd_obj.AddRunCommand(
+          command='rm -rf %s' % buildbot_pydoc_working_dir,
+          description='CleanupBuildbotPydoc')
+      # Generate Buildbot Pydoc documentation.
+      self._skia_cmd_obj.AddRunCommand(
+          command='BUILDBOT_PYDOC_TEMPDIR=%s bash %s' % (
+              buildbot_pydoc_working_dir, update_buildbot_pydoc_path),
+          description='UpdateBuildbotPydoc')
+      if self._do_upload_results:
+        # Upload Buildbot Pydoc.
+        self._skia_cmd_obj.AddMergeIntoSvn(
+            source_dir_path=self.TargetPathJoin(
+                buildbot_pydoc_working_dir, 'buildbot-docs'),
+            dest_svn_url=buildbot_pydoc_actual_svn_baseurl,
+            merge_dir_path=os.path.join(buildbot_pydoc_working_dir, 'merge'),
+            svn_username_file=self._autogen_svn_username_file,
+            svn_password_file=self._autogen_svn_password_file,
+            commit_message=WithProperties(
+                'UploadBuildbotPydoc of r%%(%s:-)s on %s' % (
+                    'revision', self._builder_name)),
+            description='UploadBuildbotPydoc')
 
-    # Generate and upload Doxygen documentation.
-    doxygen_actual_svn_baseurl = '%s/%s' % (AUTOGEN_SVN_BASEURL, 'docs')
-    update_doxygen_path = self.TargetPathJoin('tools', 'update-doxygen.sh')
-    doxygen_working_dir = self.TargetPathJoin(tempfile.gettempdir(), 'doxygen')
-    # Cleanup the previous (if any) doxygen working dir.
-    self._skia_cmd_obj.AddRunCommand(
-        command='rm -rf %s' % doxygen_working_dir, description='CleanupDoxygen')
-    # Generate Doxygen documentation.
-    self._skia_cmd_obj.AddRunCommand(
-        command='DOXYGEN_TEMPDIR=%s DOXYGEN_COMMIT=false bash %s' % (
-            doxygen_working_dir, update_doxygen_path),
-        description='UpdateDoxygen')
-    if self._do_upload_results:
-      # Upload Doxygen.
-      self._skia_cmd_obj.AddMergeIntoSvn(
-          source_dir_path=self.TargetPathJoin(
-              doxygen_working_dir, 'docs'),
-          dest_svn_url=doxygen_actual_svn_baseurl,
-          merge_dir_path=os.path.join(doxygen_working_dir, 'merge'),
-          svn_username_file=self._autogen_svn_username_file,
-          svn_password_file=self._autogen_svn_password_file,
-          commit_message=WithProperties(
-              'UploadDoxygen of r%%(%s:-)s on %s' % (
-                  'revision', self._builder_name)),
-          description='UploadDoxygen')
+      # Generate and upload Doxygen documentation.
+      doxygen_actual_svn_baseurl = '%s/%s' % (AUTOGEN_SVN_BASEURL, 'docs')
+      update_doxygen_path = self.TargetPathJoin('tools', 'update-doxygen.sh')
+      doxygen_working_dir = self.TargetPathJoin(
+          tempfile.gettempdir(), 'doxygen')
+      # Cleanup the previous (if any) doxygen working dir.
+      self._skia_cmd_obj.AddRunCommand(
+          command='rm -rf %s' % doxygen_working_dir,
+          description='CleanupDoxygen')
+      # Generate Doxygen documentation.
+      self._skia_cmd_obj.AddRunCommand(
+          command='DOXYGEN_TEMPDIR=%s DOXYGEN_COMMIT=false bash %s' % (
+              doxygen_working_dir, update_doxygen_path),
+          description='UpdateDoxygen')
+      if self._do_upload_results:
+        # Upload Doxygen.
+        self._skia_cmd_obj.AddMergeIntoSvn(
+            source_dir_path=self.TargetPathJoin(
+                doxygen_working_dir, 'docs'),
+            dest_svn_url=doxygen_actual_svn_baseurl,
+            merge_dir_path=os.path.join(doxygen_working_dir, 'merge'),
+            svn_username_file=self._autogen_svn_username_file,
+            svn_password_file=self._autogen_svn_password_file,
+            commit_message=WithProperties(
+                'UploadDoxygen of r%%(%s:-)s on %s' % (
+                    'revision', self._builder_name)),
+            description='UploadDoxygen')
 
     return self