Bug 1409739: Remove old DMD configs
MozReview-Commit-ID: H7kc33CXIbQ
deleted file mode 100644
--- a/browser/config/mozconfigs/linux32/opt-dmd
+++ /dev/null
@@ -1,3 +0,0 @@
-ac_add_options --enable-dmd
-
-. "$topsrcdir/browser/config/mozconfigs/linux32/nightly"
deleted file mode 100644
--- a/browser/config/mozconfigs/linux64/opt-dmd
+++ /dev/null
@@ -1,3 +0,0 @@
-ac_add_options --enable-dmd
-
-. "$topsrcdir/browser/config/mozconfigs/linux64/nightly"
deleted file mode 100644
--- a/browser/config/mozconfigs/macosx64/opt-dmd
+++ /dev/null
@@ -1,3 +0,0 @@
-ac_add_options --enable-dmd
-
-. "$topsrcdir/browser/config/mozconfigs/macosx64/nightly"
deleted file mode 100644
--- a/browser/config/mozconfigs/win32/opt-dmd
+++ /dev/null
@@ -1,3 +0,0 @@
-ac_add_options --enable-dmd
-
-. "$topsrcdir/browser/config/mozconfigs/win32/nightly"
deleted file mode 100644
--- a/browser/config/mozconfigs/win64/opt-dmd
+++ /dev/null
@@ -1,3 +0,0 @@
-ac_add_options --enable-dmd
-
-. "$topsrcdir/browser/config/mozconfigs/win64/nightly"
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -22,47 +22,16 @@ linux64/opt:
tooltool-downloads: public
need-xvfb: true
toolchains:
- linux64-clang
- linux64-gcc
- linux64-rust
- linux64-sccache
-linux64-dmd/opt:
- description: "Linux64 DMD Opt"
- index:
- product: firefox
- job-name: linux64-dmd-opt
- treeherder:
- platform: linux64-dmd/opt
- symbol: tc(Bdmd)
- tier: 2
- worker-type: aws-provisioner-v1/gecko-{level}-b-linux
- worker:
- max-run-time: 36000
- env:
- TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
- run:
- using: mozharness
- actions: [get-secrets build check-test update]
- config:
- - builds/releng_base_linux_64_builds.py
- script: "mozharness/scripts/fx_desktop_build.py"
- custom-build-variant-cfg: dmd
- secrets: true
- tooltool-downloads: public
- need-xvfb: true
- run-on-projects: [ ]
- toolchains:
- - linux64-clang
- - linux64-gcc
- - linux64-rust
- - linux64-sccache
-
linux64/pgo:
description: "Linux64 PGO"
index:
product: firefox
job-name: linux64-pgo
treeherder:
platform: linux64/pgo
symbol: tc(B)
--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@@ -54,48 +54,16 @@ macosx64/opt:
toolchains:
- linux64-cctools-port
- linux64-clang
- linux64-hfsplus
- linux64-libdmg
- linux64-rust-macos
- linux64-sccache
-macosx64-dmd/opt:
- description: "MacOS X x64 DMD Cross-compile"
- index:
- product: firefox
- job-name: macosx64-dmd-opt
- treeherder:
- platform: osx-10-10-dmd/opt
- symbol: tc(Bdmd)
- tier: 2
- worker-type: aws-provisioner-v1/gecko-{level}-b-macosx64
- worker:
- max-run-time: 36000
- env:
- TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
- run:
- using: mozharness
- actions: [get-secrets build update]
- config:
- - builds/releng_base_mac_64_cross_builds.py
- script: "mozharness/scripts/fx_desktop_build.py"
- custom-build-variant-cfg: dmd
- secrets: true
- tooltool-downloads: internal
- run-on-projects: [ ]
- toolchains:
- - linux64-cctools-port
- - linux64-clang
- - linux64-hfsplus
- - linux64-libdmg
- - linux64-rust-macos
- - linux64-sccache
-
macosx64-devedition-nightly/opt:
description: "MacOS X Dev Edition x64 Nightly"
attributes:
nightly: true
index:
product: devedition
job-name: macosx64-opt
type: nightly
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -41,42 +41,16 @@ win32/opt:
script: mozharness/scripts/fx_desktop_build.py
config:
- builds/taskcluster_firefox_windows_32_opt.py
toolchains:
- win32-clang-cl
- win32-rust
- win64-sccache
-win32-dmd/opt:
- description: "Win32 DMD Opt"
- index:
- product: firefox
- job-name: win32-dmd-opt
- treeherder:
- platform: windows2012-32-dmd/opt
- symbol: tc(Bdmd)
- tier: 2
- worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
- worker:
- max-run-time: 7200
- env:
- TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
- run:
- using: mozharness
- script: mozharness/scripts/fx_desktop_build.py
- config:
- - builds/taskcluster_firefox_windows_32_opt.py
- custom-build-variant-cfg: dmd
- run-on-projects: [ ]
- toolchains:
- - win32-clang-cl
- - win32-rust
- - win64-sccache
-
win32/pgo:
description: "Win32 Opt PGO"
index:
product: firefox
job-name: win32-pgo
treeherder:
platform: windows2012-32/pgo
symbol: tc(B)
@@ -140,42 +114,16 @@ win64/opt:
script: mozharness/scripts/fx_desktop_build.py
config:
- builds/taskcluster_firefox_windows_64_opt.py
toolchains:
- win64-clang-cl
- win64-rust
- win64-sccache
-win64-dmd/opt:
- description: "Win64 DMD Opt"
- index:
- product: firefox
- job-name: win64-dmd-opt
- treeherder:
- platform: windows2012-64-dmd/opt
- symbol: tc(Bdmd)
- tier: 2
- worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
- worker:
- max-run-time: 7200
- env:
- TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
- run:
- using: mozharness
- script: mozharness/scripts/fx_desktop_build.py
- config:
- - builds/taskcluster_firefox_windows_64_opt.py
- custom-build-variant-cfg: dmd
- run-on-projects: [ ]
- toolchains:
- - win64-clang-cl
- - win64-rust
- - win64-sccache
-
win32-nightly/opt:
description: "Win32 Nightly"
index:
product: firefox
job-name: win32-opt
type: nightly
attributes:
nightly: true
--- a/taskcluster/taskgraph/target_tasks.py
+++ b/taskcluster/taskgraph/target_tasks.py
@@ -377,26 +377,16 @@ def target_tasks_nightly_desktop(full_ta
return list(
set(target_tasks_nightly_win32(full_task_graph, parameters))
| set(target_tasks_nightly_win64(full_task_graph, parameters))
| set(target_tasks_nightly_macosx(full_task_graph, parameters))
| set(target_tasks_nightly_linux(full_task_graph, parameters))
)
-# Opt DMD builds should only run nightly
-@_target_task('nightly_dmd')
-def target_tasks_dmd(full_task_graph, parameters):
- """Target DMD that run nightly on the m-c branch."""
- def filter(task):
- platform = task.attributes.get('build_platform', '')
- return platform.endswith('-dmd')
- return [l for l, t in full_task_graph.tasks.iteritems() if filter(t)]
-
-
@_target_task('file_update')
def target_tasks_file_update(full_task_graph, parameters):
"""Select the set of tasks required to perform nightly in-tree file updates
"""
def filter(task):
# For now any task in the repo-update kind is ok
return task.kind in ['repo-update']
return [l for l, t in full_task_graph.tasks.iteritems() if filter(t)]
--- a/taskcluster/taskgraph/transforms/gecko_v2_whitelist.py
+++ b/taskcluster/taskgraph/transforms/gecko_v2_whitelist.py
@@ -59,29 +59,27 @@ JOB_NAME_WHITELIST = set([
'linux64-noopt-debug',
'linux64-opt',
'linux64-pgo',
'linux64-rusttests-opt',
'linux64-rusttests-debug',
'linux64-st-an-debug',
'linux64-st-an-opt',
'linux64-valgrind-opt',
- 'linux64-dmd-opt',
'macosx64-add-on-devel',
'macosx64-clang-tidy',
'macosx64-debug',
'macosx64-nightly-repackage',
'macosx64-nightly-repackage-signing',
'macosx64-noopt-debug',
'macosx64-opt',
'macosx64-devedition-nightly-repackage',
'macosx64-devedition-nightly-repackage-signing',
'macosx64-st-an-debug',
'macosx64-st-an-opt',
- 'macosx64-dmd-opt',
'shell-haz-debug',
'sm-arm-sim-debug',
'sm-arm64-sim-debug',
'sm-asan-opt',
'sm-compacting-debug',
'sm-win-compacting-debug',
'sm-fuzzing',
'sm-mozjs-sys-debug',
@@ -104,34 +102,32 @@ JOB_NAME_WHITELIST = set([
'win32-nightly-repackage',
'win32-nightly-repackage-signing',
'win32-noopt-debug',
'win32-opt',
'win32-pgo',
'win32-rusttests-opt',
'win32-st-an-debug',
'win32-st-an-opt',
- 'win32-dmd-opt',
'win64-add-on-devel',
'win64-clang-tidy',
'win64-debug',
'win64-devedition-opt',
'win64-devedition-nightly-repackage',
'win64-devedition-nightly-repackage-signing',
'win64-nightly-repackage',
'win64-nightly-repackage-signing',
'win64-noopt-debug',
'win64-opt',
'win64-pgo',
'win64-rusttests-opt',
'win64-st-an-debug',
'win64-st-an-opt',
'win64-asan-debug',
'win64-asan-opt',
- 'win64-dmd-opt',
'win32-mingw32-debug',
])
JOB_NAME_WHITELIST_ERROR = """\
The gecko-v2 job name {} is not in the whitelist in gecko_v2_whitelist.py.
If this job runs on Buildbot, please ensure that the job names match between
Buildbot and TaskCluster, then add the job name to the whitelist. If this is a
new job, there is nothing to check -- just add the job to the whitelist.
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_dmd.py
+++ /dev/null
@@ -1,3 +0,0 @@
-config = {
- 'src_mozconfig': 'browser/config/mozconfigs/linux32/opt-dmd',
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_dmd.py
+++ /dev/null
@@ -1,3 +0,0 @@
-config = {
- 'src_mozconfig': 'browser/config/mozconfigs/linux64/opt-dmd',
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_dmd.py
+++ /dev/null
@@ -1,3 +0,0 @@
-config = {
- 'src_mozconfig': 'browser/config/mozconfigs/macosx64/opt-dmd',
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_dmd.py
+++ /dev/null
@@ -1,3 +0,0 @@
-config = {
- 'src_mozconfig': 'browser/config/mozconfigs/win32/opt-dmd',
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/64_dmd.py
+++ /dev/null
@@ -1,3 +0,0 @@
-config = {
- 'src_mozconfig': 'browser/config/mozconfigs/win64/opt-dmd',
-}
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -378,17 +378,16 @@ class BuildOptionParser(object):
'android-test': 'builds/releng_sub_%s_configs/%s_test.py',
'android-checkstyle': 'builds/releng_sub_%s_configs/%s_checkstyle.py',
'android-lint': 'builds/releng_sub_%s_configs/%s_lint.py',
'android-findbugs': 'builds/releng_sub_%s_configs/%s_findbugs.py',
'valgrind' : 'builds/releng_sub_%s_configs/%s_valgrind.py',
'artifact': 'builds/releng_sub_%s_configs/%s_artifact.py',
'debug-artifact': 'builds/releng_sub_%s_configs/%s_debug_artifact.py',
'devedition': 'builds/releng_sub_%s_configs/%s_devedition.py',
- 'dmd': 'builds/releng_sub_%s_configs/%s_dmd.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