475679 - create "moz2-master2" instance

Status: RESOLVED FIXED

(Release Engineering :: General, defect, P2)

Description

[John O'Duinn [:joduinn] (please use "needinfo?" flag)]

In today's meeting, we decided to setup an additional buildbot master instance running on the existing staging-master.b.m.o VM. This new master instance would be called staging-master2, and be identical to staging-master in all ways except for the port#s

By default, staging-master2 would have no slaves attached to it, but if any are needed, slaves will be borrowed from staging-master, and returned afterwards.

(assigning to bhearsum as requested)

Comment 1

[[e-mail] (:bhearsum)]

Actually, we'll be calling it "moz2-master2" - the original is called "moz2-master".

Comment 2

[[e-mail] (:bhearsum)]

Attachment: tweaks to mozilla2-staging configs to support a second staging environment

Changes here are:
* Move master.cfg to master-main.cfg; drop slavePortnum and WebStatus definitions.
* Create master1.cfg and master2.cfg, which execfile('master-main.cfg') and add the slavePortnum/WebStatus definitions.

There will be same changes on staging-master when this lands, too. Here's what things will need to look like (excess trimmed to save space):
bitters-2:buildbot bhearsum$ ls -l
total 16
lrwxr-xr-x   1 bhearsum  bhearsum   26 28 Jan 12:20 configs -> user-configs/clean-configs
lrwxr-xr-x   1 bhearsum  bhearsum   26 28 Jan 12:21 configs2 -> user-configs/clean-configs
drwxr-xr-x  11 bhearsum  bhearsum  374 28 Jan 12:23 moz2-master
drwxr-xr-x  11 bhearsum  bhearsum  374 28 Jan 12:23 moz2-master2
drwxr-xr-x   3 bhearsum  bhearsum  102 28 Jan 12:20 user-configs

bitters-2:moz2-master bhearsum$ ls -l
lrwxr-xr-x  1 bhearsum  bhearsum    37 28 Jan 12:22 config.py -> ../configs/mozilla2-staging/config.py
lrwxr-xr-x  1 bhearsum  bhearsum    43 28 Jan 12:22 master-main.cfg -> ../configs/mozilla2-staging/master-main.cfg
lrwxr-xr-x  1 bhearsum  bhearsum    39 28 Jan 12:22 master.cfg -> ../configs/mozilla2-staging/master1.cfg

bitters-2:moz2-master2 bhearsum$ ls -l
lrwxr-xr-x  1 bhearsum  bhearsum    38 28 Jan 12:22 config.py -> ../configs2/mozilla2-staging/config.py
lrwxr-xr-x  1 bhearsum  bhearsum    44 28 Jan 12:22 master-main.cfg -> ../configs2/mozilla2-staging/master-main.cfg
lrwxr-xr-x  1 bhearsum  bhearsum    40 28 Jan 12:22 master.cfg -> ../configs2/mozilla2-staging/master2.cfg


By doing this we can avoid duplicating all of the code in mozilla2-staging/, but we also allow 2 people to have local changes at the same time. I haven't totally figured out what to do with buildbotcustom yet. We might have to do something trickier and have a Makefile or script that sets the proper PYTHONPATH, and then use 'make stop/start/restart/etc' instead of 'buildbot ...'.

Comment 3

[[e-mail] (:bhearsum)]

Comment on attachment 359303 [details] [diff] [review]
tweaks to mozilla2-staging configs to support a second staging environment

changeset:   706:52fd902f5fcd

Comment 4

[[e-mail] (:bhearsum)]

Alright, that patch is checked in and the symlinks have been updated. I'll work on a solution for independent buildbotcustom checkouts for each master tomorrow.

Comment 5

[[e-mail] (:bhearsum)]

Alright, we've got support for different buildbotcustom code for each master. Documented here: https://wiki.mozilla.org/ReleaseEngineering:StagingMaster.

Still waiting on new slaves, which is being tracked in bug 475748