Move 'buildbot.tac' and 'buildbot' files to a common directory.

masters/master-common-rules.mk

 # -*- makefile -*-
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This should be included by a makefile which lives in a buildmaster/buildslave
 # directory (next to the buildbot.tac file). That including makefile *must*
 # define MASTERPATH.
 
 # The 'start' and 'stop' targets start and stop the buildbot master.
@@ skipping 30 matching lines @@
         @if (hostname -f | grep -q '^master.*\.chromium\.org'); then \
                 /bin/echo ; \
                 /bin/echo -e "\033[1;31m***"; \
                 /bin/echo "Are you manually restarting a master? This master is most likely"; \
                 /bin/echo "being managed by master manager. Check out 'Issuing a restart' at"; \
                 /bin/echo -e "\033[1;34mgo/master-manager\033[1;31m for more details."; \
                 /bin/echo -e "***\033[0m"; \
                 /bin/echo ; \
         fi
 
-ifeq ($(BUILDBOT_PATH),$(BUILDBOT8_PATH))
 start: notify printstep bootstrap
-else
-start: notify printstep
-endif
 ifndef NO_REVISION_AUDIT
         @if [ ! -f "$(GCLIENT)" ]; then \
             echo "gclient not found.  Add depot_tools to PATH or use DEPS checkout."; \
             exit 2; \
         fi
         $(GCLIENT) revinfo -a | tee revinfo.log >> actions.log || true
         $(GCLIENT) diff >> actions.log || true
         @($(INFRA_RUNPY) infra.tools.send_monitoring_event \
                    --service-event-revinfo=$(CURRENT_DIR)/revinfo.log \
                    --service-event-type=START \
                    --event-mon-run-type=prod \
                    --event-mon-service-name \
                    buildbot/master/$(MASTERPATH) \
    || echo 'Running send_monitoring_event failed, skipping sending events.' \
   ) 2>&1 | tee -a actions.log
 endif
 ifneq ($(wildcard $(FLOCK)),)
-        PYTHONPATH=$(PYTHONPATH) SCRIPTS_DIR=$(SCRIPTS_DIR) $(FLOCK) -n $(LOCKFILE) $(TOPLEVEL_DIR)/build/masters/start_master.sh || ( \
+        PYTHONPATH=$(PYTHONPATH) \
+        SCRIPTS_DIR=$(SCRIPTS_DIR) \
+        TOPLEVEL_DIR=$(TOPLEVEL_DIR) \
+        $(FLOCK) -n $(LOCKFILE) \
+        $(TOPLEVEL_DIR)/build/masters/start_master.sh || ( \
         echo "Failure to start master. Check to see if a master is running and" \
              "holding the lock on $(LOCKFILE)."; exit 1)
 else
-        PYTHONPATH=$(PYTHONPATH) SCRIPTS_DIR=$(SCRIPTS_DIR) $(TOPLEVEL_DIR)/build/masters/start_master.sh
+        PYTHONPATH=$(PYTHONPATH) \
+        SCRIPTS_DIR=$(SCRIPTS_DIR) \
+        TOPLEVEL_DIR=$(TOPLEVEL_DIR) \
+        $(TOPLEVEL_DIR)/build/masters/start_master.sh
 endif
 
 
-ifeq ($(BUILDBOT_PATH),$(BUILDBOT8_PATH))
 start-prof: bootstrap
-else
-start-prof:
-endif
-        TWISTD_PROFILE=1 PYTHONPATH=$(PYTHONPATH) python $(SCRIPTS_DIR)/common/twistd --no_save -y buildbot.tac
+        TWISTD_PROFILE=1 PYTHONPATH=$(PYTHONPATH) \
+        python $(SCRIPTS_DIR)/common/twistd -y $(TOPLEVEL_DIR)/build/masters/buildbot.tac
 
 stop: notify printstep
 ifndef NO_REVISION_AUDIT
         @($(INFRA_RUNPY) infra.tools.send_monitoring_event \
                    --service-event-type=STOP \
                    --event-mon-run-type=prod \
                    --event-mon-service-name \
                    buildbot/master/$(MASTERPATH) \
    || echo 'Running send_monitoring_event failed, skipping sending events' \
   ) 2>&1 | tee -a actions.log
@@ skipping 26 matching lines @@
 wait:
         while `test -f twistd.pid`; do sleep 1; done;
 
 waitforstart:
         while `test ! -f twistd.pid`; do sleep 1; done;
 
 restart: notify stop wait start log
 
 restart-prof: stop wait start-prof log
 
-# This target is only known to work on 0.8.x masters.
-upgrade: printstep
-        @[ -e '.dbconfig' ] || [ -e 'state.sqlite' ] || \
-        PYTHONPATH=$(PYTHONPATH) python buildbot upgrade-master .
-
-# This target is only known to be useful on 0.8.x masters.
 bootstrap: printstep
         @[ -e '.dbconfig' ] || [ -e 'state.sqlite' ] || \
-        PYTHONPATH=$(PYTHONPATH) python $(SCRIPTS_DIR)/tools/state_create.py \
-        --restore --db='state.sqlite' --txt '../state-template.txt'
+        PYTHONPATH=$(PYTHONPATH) python $(TOPLEVEL_DIR)/build/masters/buildbot \
+        upgrade-master .
 
 setup:
         @echo export PYTHONPATH=$(PYTHONPATH)