masters/master.client.gyp/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.gyp/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.client.crashpad/master_site_config.py ('k') | masters/master.client.gyp/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 "gyp_linux": {	3 "gyp_linux": {

4 "recipe": "gyp",	4 "recipe": "gyp",

5 "slave_pools": ["linux"],	5 "slave_pools": ["linux"],

6 "slavebuilddir": "gyp",	6 "slavebuilddir": "gyp",

7 },	7 },

8 "gyp_mac": {	8 "gyp_mac": {

9 "recipe": "gyp",	9 "recipe": "gyp",

10 "slave_pools": ["mac10.9"],	10 "slave_pools": ["mac10.9"],

11 "slavebuilddir": "gyp",	11 "slavebuilddir": "gyp",

12 },	12 },

13 "gyp_win": {	13 "gyp_win": {

14 "recipe": "gyp",	14 "recipe": "gyp",

15 "slave_pools": ["win7"],	15 "slave_pools": ["win7"],

16 "slavebuilddir": "gyp",	16 "slavebuilddir": "gyp",

17 },	17 },

18 },	18 },

19 "git_repo_url": "https://chromium.googlesource.com/external/gyp",	19 "git_repo_url": "https://chromium.googlesource.com/external/gyp",

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

21 "master_classname": "GYP",	21 "master_classname": "GYP",

22 "master_port": 20302,	22 "master_port": 20302,

23 "master_port_alt": 40302,	23 "master_port_alt": 40302,

24 "master_type": "waterfall",

25 "slave_port": 30302,	24 "slave_port": 30302,

26 "slave_pools": {	25 "slave_pools": {

27 "linux": {	26 "linux": {

28 "slave_data": {	27 "slave_data": {

29 "bits": 64,	28 "bits": 64,

30 "os": "linux",	29 "os": "linux",

31 "version": "trusty",	30 "version": "trusty",

32 },	31 },

33 "slaves": ["slave76-c3"],	32 "slaves": ["slave76-c3"],

34 },	33 },

35 "mac10.9": {	34 "mac10.9": {

36 "slave_data": {	35 "slave_data": {

37 "bits": 64,	36 "bits": 64,

38 "os": "mac",	37 "os": "mac",

39 "version": "10.9",	38 "version": "10.9",

40 },	39 },

41 "slaves": ["vm605-m3"],	40 "slaves": ["vm605-m3"],

42 },	41 },

43 "win7": {	42 "win7": {

44 "slave_data": {	43 "slave_data": {

45 "bits": 64,	44 "bits": 64,

46 "os": "win",	45 "os": "win",

47 "version": "win7",	46 "version": "win7",

48 },	47 },

49 "slaves": ["vm49-m3"],	48 "slaves": ["vm49-m3"],

50 },	49 },

51 },	50 },

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

53 }	52 }

OLD	NEW