| Index: masters/master.tryserver.nacl/master.cfg
|
| diff --git a/masters/master.tryserver.nacl/master.cfg b/masters/master.tryserver.nacl/master.cfg
|
| index 75d1f4e979bd0f4ff321de916905b7d96459fb24..bce92128582a3e09cea1d3e298eb9643c1368eeb 100644
|
| --- a/masters/master.tryserver.nacl/master.cfg
|
| +++ b/masters/master.tryserver.nacl/master.cfg
|
| @@ -633,19 +633,13 @@ b_naclports_presubmit = {
|
| }
|
| c['builders'].append(b_naclports_presubmit)
|
|
|
| -b_gyp_presubmit = {
|
| - 'name': 'gyp-presubmit',
|
| - 'slavebuilddir': 'gyp',
|
| - 'factory':
|
| - m_annotator.BaseFactory('run_presubmit', {'repo_name': 'gyp'}),
|
| - 'slavenames': GetSlaveNames(['precise64'])
|
| -}
|
| -c['builders'].append(b_gyp_presubmit)
|
| -
|
| -# Set "root" build property to "native_client" in all nacl-* builders.
|
| +# Set "root" build property to "native_client" in all nacl-* builders,
|
| +# set it to "src" on all others.
|
| for b in c['builders']:
|
| if b['name'].startswith('nacl-'):
|
| b.setdefault('properties', {})['root'] = 'native_client'
|
| + else:
|
| + b.setdefault('properties', {})['root'] = 'src'
|
|
|
| ####### BUILDSLAVES
|
|
|
| @@ -664,7 +658,6 @@ c['schedulers'] = []
|
| code_review_sites = {
|
| 'nacl': ActiveMaster.code_review_site,
|
| 'nacl-toolchain': ActiveMaster.code_review_site,
|
| - 'gyp': ActiveMaster.code_review_site,
|
| 'naclports': ActiveMaster.code_review_site,
|
| }
|
| c['schedulers'].append(TryJobHTTP(
|
| @@ -688,12 +681,6 @@ if LISTEN_TO_RIETVELD:
|
| project='nacl',
|
| filter_master=True))
|
| c['schedulers'].append(TryJobRietveld(
|
| - name='try_job_rietveld_gyp',
|
| - pools=pools,
|
| - code_review_sites=code_review_sites,
|
| - project='gyp',
|
| - filter_master=True))
|
| - c['schedulers'].append(TryJobRietveld(
|
| name='try_job_rietveld_naclports',
|
| pools=pools,
|
| code_review_sites=code_review_sites,
|
|
|