masters/master.client.catapult/builders.pyl - Issue 1153203003: Update buildbot_tool and builders.pyl templates to remove 'master_type'.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: masters/master.client.catapult/builders.pyl

Issue 1153203003: Update buildbot_tool and builders.pyl templates to remove 'master_type'. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build

Patch Set: Created 5 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « masters/master.chromium.mojo/master_site_config.py ('k') | masters/master.client.catapult/master_site_config.py » ('j') | scripts/master/unittests/master_gen_test.py » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 {	1 {

2 "builders": {	2 "builders": {

3 "Catapult Linux": {	3 "Catapult Linux": {

4 "recipe": "catapult",	4 "recipe": "catapult",

5 "slave_pools": ["linux_slave_pool"],	5 "slave_pools": ["linux_slave_pool"],

6 "slavebuilddir": "catapult",	6 "slavebuilddir": "catapult",

7 },	7 },

8 "Catapult Mac": {	8 "Catapult Mac": {

9 "recipe": "catapult",	9 "recipe": "catapult",

10 "slave_pools": ["mac_slave_pool"],	10 "slave_pools": ["mac_slave_pool"],

11 "slavebuilddir": "catapult",	11 "slavebuilddir": "catapult",

12 },	12 },

13 "Catapult Windows": {	13 "Catapult Windows": {

14 "recipe": "catapult",	14 "recipe": "catapult",

15 "slave_pools": ["win_slave_pool"],	15 "slave_pools": ["win_slave_pool"],

16 "slavebuilddir": "catapult",	16 "slavebuilddir": "catapult",

17 },	17 },

18 },	18 },

19 "git_repo_url": "https://chromium.googlesource.com/external/github.com/catapul t-project/catapult.git",	19 "git_repo_url": "https://chromium.googlesource.com/external/github.com/catapul t-project/catapult.git",

20 "master_base_class": "Master3",	20 "master_base_class": "Master3",

21 "master_classname": "Catapult",	21 "master_classname": "Catapult",

22 "master_port": 20303,	22 "master_port": 20303,

23 "master_port_alt": 40303,	23 "master_port_alt": 40303,

24 "master_type": "waterfall",

25 "slave_pools": {	24 "slave_pools": {

26 "linux_slave_pool": {	25 "linux_slave_pool": {

27 "slave_data": {	26 "slave_data": {

28 "bits": 64,	27 "bits": 64,

29 "os": "linux",	28 "os": "linux",

30 "version": "precise",	29 "version": "precise",

31 },	30 },

32 "slaves": ["vm600-m3"],	31 "slaves": ["vm600-m3"],

33 },	32 },

34 "mac_slave_pool": {	33 "mac_slave_pool": {

35 "slave_data": {	34 "slave_data": {

36 "bits": 64,	35 "bits": 64,

37 "os": "mac",	36 "os": "mac",

38 "version": "10.9",	37 "version": "10.9",

39 },	38 },

40 "slaves": ["vm113-m3"],	39 "slaves": ["vm113-m3"],

41 },	40 },

42 "win_slave_pool": {	41 "win_slave_pool": {

43 "slave_data": {	42 "slave_data": {

44 "bits": 64,	43 "bits": 64,

45 "os": "win",	44 "os": "win",

46 "version": "win7",	45 "version": "win7",

47 },	46 },

48 "slaves": ["vm114-m3"],	47 "slaves": ["vm114-m3"],

49 },	48 },

50 },	49 },

51 "slave_port": 30303,	50 "slave_port": 30303,

52 "templates": ["../master.chromium/templates"],	51 "templates": ["../master.chromium/templates"],

53 }	52 }

OLD	NEW