Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use yaml for buildbot steps #325

Merged
merged 12 commits into from Apr 20, 2016
Next

Remove gonk

In b7fc797, we disabled blocking on
gonk; since we're not using the results, removing the builder will
use less resources.
  • Loading branch information
aneeshusa committed Apr 20, 2016
commit caa1d410e4bb67a1cb1e156e91d605f911e27b7a
@@ -48,7 +48,7 @@ c['schedulers'] = []
c['schedulers'].append(schedulers.AnyBranchScheduler(
name="servo-auto",
treeStableTimer=None,
builderNames=["linux-dev", "linux-rel", "mac-rel-wpt", "mac-dev-unit", "mac-rel-css", "android", "gonk", "arm32", "arm64", "windows"],
builderNames=["linux-dev", "linux-rel", "mac-rel-wpt", "mac-dev-unit", "mac-rel-css", "android", "arm32", "arm64", "windows"],
change_filter=util.ChangeFilter(filter_fn=servo_auto_try_filter),
))
c['schedulers'].append(schedulers.SingleBranchScheduler(
@@ -59,7 +59,7 @@ c['schedulers'].append(schedulers.SingleBranchScheduler(
))
c['schedulers'].append(schedulers.ForceScheduler(
name="force",
builderNames=["linux-dev", "linux-rel", "mac-rel-wpt", "mac-dev-unit", "mac-rel-css", "android", "gonk", "arm32", "arm64", "android-nightly", "windows"]
builderNames=["linux-dev", "linux-rel", "mac-rel-wpt", "mac-dev-unit", "mac-rel-css", "android", "arm32", "arm64", "android-nightly", "windows"]
))
c['schedulers'].append(schedulers.Nightly(
name="Nightly",
@@ -202,19 +202,6 @@ android_nightly_factory = create_servo_factory([
"s3://servo-rust/nightly/servo.apk"]),
])

gonk_compile_env = dict({'ANDROID_SDK': '{{ common.servo_home }}/android/sdk/current/',
'ANDROID_NDK': '{{ common.servo_home }}/android/ndk/current/',
'ANDROID_TOOLCHAIN': '{{ common.servo_home }}/android/toolchain/current/',
'GONKDIR': '{{ common.servo_home }}/B2G/',
'PATH': '/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin:{{ common.servo_home }}/B2G/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7/bin'},
**linux_test_env)

gonk_factory = create_servo_factory([
steps.Compile(command=["./mach", "build-gonk"], env=gonk_compile_env),
steps.ShellCommand(command=["bash", "./etc/ci/lockfile_changed.sh"], env=gonk_compile_env),
steps.ShellCommand(command=["bash", "./etc/ci/manifest_changed.sh"], env=gonk_compile_env),
])

arm32_compile_env = dict({'PATH': '{{ common.servo_home }}/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin',
'BUILD_TARGET': 'arm-unknown-linux-gnueabihf',
'PKG_CONFIG_ALLOW_CROSS': '1',
@@ -292,13 +279,6 @@ c['builders'].append(util.BuilderConfig(
nextBuild=branch_priority,
category="auto",
))
c['builders'].append(util.BuilderConfig(
name="gonk",
slavenames=CROSS_SLAVES,
factory=gonk_factory,
nextBuild=branch_priority,
category="auto",
))
c['builders'].append(util.BuilderConfig(
name="arm32",
slavenames=CROSS_SLAVES,
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.