Bug 1253298 - Enable TC Linux64 PGO builds as Tier 2. r=gbrown
MozReview-Commit-ID: 5y3V9yKM7fb
***
Bug 1253298 - Enable TC Linux64 PGO builds as Tier 2. r=gbrown
MozReview-Commit-ID: 8bMC9ShMEuT
--- a/testing/taskcluster/scripts/builder/build-linux.sh
+++ b/testing/taskcluster/scripts/builder/build-linux.sh
@@ -8,16 +8,17 @@ echo "running as" $(id)
# Taskcluster friendly wrapper for performing fx desktop builds via mozharness.
####
# Inputs, with defaults
: MOZHARNESS_SCRIPT ${MOZHARNESS_SCRIPT}
: MOZHARNESS_CONFIG ${MOZHARNESS_CONFIG}
: MOZHARNESS_ACTIONS ${MOZHARNESS_ACTIONS}
+: MOZHARNESS_OPTIONS ${MOZHARNESS_OPTIONS}
: TOOLTOOL_CACHE ${TOOLTOOL_CACHE:=/home/worker/tooltool-cache}
: 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}
@@ -110,18 +111,28 @@ done
# in the mozharness configuration)
if [ -n "$MOZHARNESS_ACTIONS" ]; then
actions=""
for action in $MOZHARNESS_ACTIONS; do
actions="$actions --$action"
done
fi
+# if MOZHARNESS_OPTIONS is given, append them to mozharness command line run
+# e.g. enable-pgo
+if [ -n "$MOZHARNESS_OPTIONS" ]; then
+ options=""
+ for option in $MOZHARNESS_OPTIONS; do
+ options="$options --$option"
+ done
+fi
+
python2.7 $WORKSPACE/build/src/testing/${MOZHARNESS_SCRIPT} ${config_cmds} \
$debug_flag \
$custom_build_variant_cfg_flag \
--disable-mock \
$actions \
+ $options \
--log-level=debug \
--scm-level=$MOZ_SCM_LEVEL \
--work-dir=$WORKSPACE/build \
--branch=${MH_BRANCH} \
--build-pool=${MH_BUILD_POOL}
--- a/testing/taskcluster/tasks/branches/base_job_flags.yml
+++ b/testing/taskcluster/tasks/branches/base_job_flags.yml
@@ -93,16 +93,17 @@ flags:
- aries-eng
- android-api-15
- android-api-15-frontend
- android-partner-sample1
- linux
- linux64
- linux64-st-an
- linux64-artifact
+ - linux64-pgo
- macosx64
- macosx64-st-an
tests:
- cppunit
- crashtest
- crashtest-e10s
- crashtest-ipc
--- a/testing/taskcluster/tasks/branches/base_jobs.yml
+++ b/testing/taskcluster/tasks/branches/base_jobs.yml
@@ -76,16 +76,22 @@ builds:
debug:
task: tasks/builds/haz_linux.yml
linux64-shell-haz:
platforms:
- Linux64
types:
debug:
task: tasks/builds/haz_shell_linux.yml
+ linux64-pgo:
+ platforms:
+ - Linux64 PGO
+ types:
+ opt:
+ task: tasks/builds/opt_linux64_pgo.yml
macosx64:
platforms:
- MacOSX64
types:
opt:
task: tasks/builds/opt_macosx64.yml
debug:
task: tasks/builds/dbg_macosx64.yml
--- a/testing/taskcluster/tasks/branches/try/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/try/job_flags.yml
@@ -46,16 +46,22 @@ builds:
debug:
task: tasks/builds/dbg_linux64.yml
linux64-st-an:
platforms:
- Linux64 Static Analysis
types:
opt:
task: tasks/builds/opt_linux64_st-an.yml
+ linux64-pgo:
+ platforms:
+ - Linux64 PGO
+ types:
+ opt:
+ task: tasks/builds/opt_linux64_pgo.yml
macosx64:
platforms:
- MacOSX64
types:
opt:
task: tasks/builds/opt_macosx64.yml
debug:
task: tasks/builds/dbg_macosx64.yml
new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/opt_linux64_pgo.yml
@@ -0,0 +1,32 @@
+$inherits:
+ from: 'tasks/builds/base_linux64.yml'
+ variables:
+ build_name: 'linux64-pgo'
+ build_type: 'opt'
+task:
+ metadata:
+ name: '[TC] Linux64 PGO Opt'
+ description: 'Linux64 PGO Opt'
+
+ routes:
+ - 'index.buildbot.branches.{{project}}.linux64-pgo'
+ - 'index.buildbot.revisions.{{head_rev}}.{{project}}.linux64-pgo'
+
+ workerType: opt-linux64
+
+ payload:
+ env:
+ # add various options to mozharness command line run
+ MOZHARNESS_OPTIONS: 'enable-pgo'
+
+ extra:
+ treeherder:
+ groupSymbol: tc
+ groupName: Submitted by taskcluster
+ machine:
+ # see https://github.com/mozilla/treeherder/blob/master/ui/js/values.js
+ platform: linux64
+ symbol: B
+ tier: 2
+ collection:
+ pgo: true