Bug 1257385 - Stop b2gdroid builds on automation
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_b2gdroid.py
+++ /dev/null
@@ -1,9 +0,0 @@
-config = {
- 'base_name': 'Android armv7 API 15+ b2gdroid %(branch)s',
- 'stage_platform': 'android-api-15-b2gdroid',
- 'build_type': 'api-15-b2gdroid-opt',
- 'src_mozconfig': 'mobile/android/b2gdroid/config/mozconfigs/nightly',
- 'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/b2gdroid/releng.manifest',
- 'multi_locale_config_platform': 'android',
- 'enable_nightly_promotion': True,
-}
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -361,18 +361,16 @@ class BuildOptionParser(object):
'api-15-gradle-dependencies': 'builds/releng_sub_%s_configs/%s_api_15_gradle_dependencies.py',
'api-15': 'builds/releng_sub_%s_configs/%s_api_15.py',
'api-9-debug': 'builds/releng_sub_%s_configs/%s_api_9_debug.py',
'api-11-debug': 'builds/releng_sub_%s_configs/%s_api_11_debug.py',
'api-15-debug': 'builds/releng_sub_%s_configs/%s_api_15_debug.py',
'x86': 'builds/releng_sub_%s_configs/%s_x86.py',
'api-11-partner-sample1': 'builds/releng_sub_%s_configs/%s_api_11_partner_sample1.py',
'api-15-partner-sample1': 'builds/releng_sub_%s_configs/%s_api_15_partner_sample1.py',
- 'api-11-b2gdroid': 'builds/releng_sub_%s_configs/%s_api_11_b2gdroid.py',
- 'api-15-b2gdroid': 'builds/releng_sub_%s_configs/%s_api_15_b2gdroid.py',
}
build_pool_cfg_file = 'builds/build_pool_specifics.py'
branch_cfg_file = 'builds/branch_specifics.py'
@classmethod
def _query_pltfrm_and_bits(cls, target_option, options):
""" determine platform and bits
--- a/testing/taskcluster/scripts/builder/build-linux.sh
+++ b/testing/taskcluster/scripts/builder/build-linux.sh
@@ -18,19 +18,16 @@ echo "running as" $(id)
: NEED_XVFB ${NEED_XVFB:=false}
: MH_CUSTOM_BUILD_VARIANT_CFG ${MH_CUSTOM_BUILD_VARIANT_CFG}
: MH_BRANCH ${MH_BRANCH:=mozilla-central}
: MH_BUILD_POOL ${MH_BUILD_POOL:=staging}
: WORKSPACE ${WORKSPACE:=/home/worker/workspace}
-# some linux variants, e.g. b2gdroid, require gaia
-: CHECKOUT_GAIA ${CHECKOUT_GAIA:=false}
-
set -v
fail() {
echo # make sure error message is on a new line
echo "[build-linux.sh:error]" "${@}"
exit 1
}
@@ -92,26 +89,16 @@ if [ 0$DEBUG -ne 0 ]; then
debug_flag='--debug'
fi
custom_build_variant_cfg_flag=""
if [ -n "${MH_CUSTOM_BUILD_VARIANT_CFG}" ]; then
custom_build_variant_cfg_flag="--custom-build-variant-cfg=${MH_CUSTOM_BUILD_VARIANT_CFG}"
fi
-if [ "$CHECKOUT_GAIA" = true ]; then
- pull_gaia=$GECKO_DIR/testing/taskcluster/scripts/builder/pull-gaia.sh
- gaia_props=$GECKO_DIR/testing/taskcluster/scripts/builder/gaia_props.py
- gaia_dir=$WORKSPACE/build/gaia
-
- $pull_gaia $GECKO_DIR $gaia_dir $gaia_props
- rm -f $GECKO_DIR/gaia
- ln -s $gaia_dir $GECKO_DIR/gaia
-fi
-
# $TOOLTOOL_CACHE bypasses mozharness completely and is read by tooltool_wrapper.sh to set the
# cache. However, only some mozharness scripts use tooltool_wrapper.sh, so this may not be
# entirely effective.
export TOOLTOOL_CACHE
# support multiple, space delimited, config files
config_cmds=""
for cfg in $MOZHARNESS_CONFIG; do
--- a/testing/taskcluster/tasks/branches/base_job_flags.yml
+++ b/testing/taskcluster/tasks/branches/base_job_flags.yml
@@ -101,17 +101,16 @@ flags:
- aries
- aries-ota
- aries-eng
- aries-dogfood
- aries-noril
- android-api-15
- android-api-15-frontend
- android-partner-sample1
- - android-b2gdroid
- linux
- linux64
- linux64-st-an
- linux64-artifact
- macosx64
- macosx64-st-an
tests:
--- a/testing/taskcluster/tasks/branches/base_jobs.yml
+++ b/testing/taskcluster/tasks/branches/base_jobs.yml
@@ -159,22 +159,16 @@ builds:
opt:
task: tasks/builds/opt_macosx64_st-an.yml
android-api-15-frontend:
platforms:
- Android
types:
opt:
task: tasks/builds/android_api_15_frontend.yml
- android-b2gdroid:
- platforms:
- - Android
- types:
- opt:
- task: tasks/builds/android_api_15_b2gdroid.yml
linux64-mulet-haz:
platforms:
- Mulet Linux
types:
debug:
task: tasks/builds/mulet_haz_linux.yml
tests:
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/android_api_15_b2gdroid.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-$inherits:
- from: 'tasks/builds/mobile_base.yml'
- variables:
- build_name: 'android-api-15-b2gdroid'
- build_type: 'opt'
-task:
- metadata:
- name: '[TC] B2GDroid armv7 API 15+'
- description: 'B2GDroid armv7 API 15+'
-
- workerType: android-api-15
-
- routes:
- - 'index.buildbot.branches.{{project}}.android-api-15-b2gdroid'
- - 'index.buildbot.revisions.{{head_rev}}.{{project}}.android-api-15-b2gdroid'
-
- scopes:
- - 'docker-worker:cache:level-{{level}}-{{project}}-build-android-api-15-workspace'
- - 'docker-worker:cache:tooltool-cache'
- - 'docker-worker:relengapi-proxy:tooltool.download.internal'
- - 'docker-worker:relengapi-proxy:tooltool.download.public'
-
- payload:
- cache:
- level-{{level}}-{{project}}-build-android-api-15-workspace: '/home/worker/workspace'
- tooltool-cache: '/home/worker/tooltool-cache'
-
- features:
- relengAPIProxy: true
-
- env:
- # inputs to mozharness
- MOZHARNESS_SCRIPT: 'mozharness/scripts/fx_desktop_build.py'
- # TODO: make these additional configuration files go away
- MOZHARNESS_CONFIG: >
- builds/releng_base_android_64_builds.py
- disable_signing.py
- platform_supports_post_upload_to_latest.py
- MH_CUSTOM_BUILD_VARIANT_CFG: api-15-b2gdroid
- MH_BRANCH: {{project}}
- MH_BUILD_POOL: taskcluster
-
- CHECKOUT_GAIA: true
-
- maxRunTime: 36000
-
- command: ["/bin/bash", "bin/build.sh"]
-
- extra:
- treeherderEnv:
- - production
- - staging
- treeherder:
- machine:
- # see https://github.com/mozilla/treeherder/blob/master/ui/js/values.js
- platform: b2gdroid-4-0-armv7-api15
- # Rather then enforcing particular conventions we require that all build
- # tasks provide the "build" extra field to specify where the build and tests
- # files are located.
- locations:
- build: 'public/build/target.linux-x86_64.tar.bz2'
- tests: 'public/build/target.tests.zip'