Bug 646035 - Use Makefile.setup instead of ve-setup.sh for preproduction. r=catlee
authorRail Aliev <rail@mozilla.com>
Tue, 19 Apr 2011 00:37:44 +0300
changeset 3992 7f00596d5a53aa79c3e5a5bb4d1e1039c680901b
parent 3991 593c8ca6dba98b755aa2f0f4dcbf1748925a3954
child 3993 4e43bbaa49273b5606bbe0c4717cf6a6e2b0fed0
push id1
push userroot
push dateWed, 17 Dec 2014 00:18:48 +0000
reviewerscatlee
bugs646035
Bug 646035 - Use Makefile.setup instead of ve-setup.sh for preproduction. r=catlee
Makefile.setup
preproduction-pip.txt
--- a/Makefile.setup
+++ b/Makefile.setup
@@ -12,16 +12,17 @@ CRONTAB = /etc/cron.d/$(MASTER_NAME)
 VIRTUALENV_PYTHON = $(BASEDIR)/bin/python
 PIP = $(BASEDIR)/bin/pip
 BUILDBOT = $(BASEDIR)/bin/buildbot
 USER = cltbld
 HOME = /home/$(USER)
 BUILDBOT_BRANCH = production-0.8
 BUILDBOTCUSTOM_BRANCH = production-0.8
 BUILDBOTCONFIGS_BRANCH = production
+INSTALL_BUILDBOT_SLAVE=
 
 all: virtualenv deps install-buildbot master master-makefile other-files done
 
 done:
 	@echo
 	@echo
 	@echo You probably want to update at least the following files to contain accurate passwords/descriptions:
 	@echo BuildSlaves.py, passwords.py, $(MYSQL_CONFIG)
@@ -34,16 +35,19 @@ deps:
 	$(PIP) install $(PIP_FLAGS) -r $(PIP_PACKAGES_FILE)
 	
 # HACK ALERT: This only works when there's only one python version in "lib".
 # This is generally true when using virtualenvs.
 install-buildbot: SITE_PACKAGES = $(BASEDIR)/lib/$(shell ls $(BASEDIR)/lib/)/site-packages
 install-buildbot:
 	$(HG) clone -b $(BUILDBOT_BRANCH) $(HG_HOST)/$(HG_DIR)/buildbot $(BASEDIR)/buildbot
 	(cd $(BASEDIR)/buildbot/master; $(VIRTUALENV_PYTHON) setup.py develop install)
+ifdef INSTALL_BUILDBOT_SLAVE
+	(cd $(BASEDIR)/buildbot/slave; $(VIRTUALENV_PYTHON) setup.py develop install)
+endif
 	$(HG) clone -b $(BUILDBOTCUSTOM_BRANCH) $(HG_HOST)/$(HG_DIR)/buildbotcustom $(BASEDIR)/buildbotcustom
 	$(HG) clone -b $(BUILDBOTCONFIGS_BRANCH) $(HG_HOST)/$(HG_DIR)/buildbot-configs $(BASEDIR)/buildbot-configs
 	$(HG) clone $(HG_HOST)/$(HG_DIR)/tools $(BASEDIR)/tools
 	# Get buildbotcustom and the build/tools library into PYTHONPATH
 	ln -s $(BASEDIR)/buildbotcustom $(SITE_PACKAGES)/buildbotcustom
 	echo "$(BASEDIR)/tools/lib/python" > $(SITE_PACKAGES)/build-tools-lib.pth
 
 master:
new file mode 100644
--- /dev/null
+++ b/preproduction-pip.txt
@@ -0,0 +1,5 @@
+coverage==3.4
+pylint==0.23.0
+mercurial==1.8.2
+mock==0.7.0
+nose==1.0.0