Bug 1386589 - Remove the linux64 tooltool manifests that look the same as releng.manifest. r?gps
deleted file mode 100644
--- a/browser/config/tooltool-manifests/linux64/asan.manifest
+++ /dev/null
@@ -1,18 +0,0 @@
-[
- {
- "version": "rustc 1.19.0 (0ade33941 2017-07-17) repack",
- "size": 161014632,
- "digest": "65bebcf94fc66ea618c58c9ac33f0f206095ecfe3931cc6edb301f4b40480e3b44b0f39aea7a25fed8eef47e63523e7e670082947a3662cdc04c68ebbe5dfc89",
- "algorithm": "sha512",
- "filename": "rustc.tar.xz",
- "unpack": true
- },
- {
- "size": 12072532,
- "digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
- "algorithm": "sha512",
- "filename": "gtk3.tar.xz",
- "setup": "setup.sh",
- "unpack": true
- }
-]
deleted file mode 100644
--- a/browser/config/tooltool-manifests/linux64/clang.manifest
+++ /dev/null
@@ -1,18 +0,0 @@
-[
- {
- "size": 12072532,
- "digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
- "algorithm": "sha512",
- "filename": "gtk3.tar.xz",
- "setup": "setup.sh",
- "unpack": true
- },
- {
- "version": "rustc 1.19.0 (0ade33941 2017-07-17) repack",
- "size": 161014632,
- "digest": "65bebcf94fc66ea618c58c9ac33f0f206095ecfe3931cc6edb301f4b40480e3b44b0f39aea7a25fed8eef47e63523e7e670082947a3662cdc04c68ebbe5dfc89",
- "algorithm": "sha512",
- "filename": "rustc.tar.xz",
- "unpack": true
- }
-]
deleted file mode 100644
--- a/browser/config/tooltool-manifests/linux64/clang.manifest.centos6
+++ /dev/null
@@ -1,18 +0,0 @@
-[
- {
- "size": 12072532,
- "digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
- "algorithm": "sha512",
- "filename": "gtk3.tar.xz",
- "setup": "setup.sh",
- "unpack": true
- },
- {
- "version": "rustc 1.19.0 (0ade33941 2017-07-17) repack",
- "size": 161014632,
- "digest": "65bebcf94fc66ea618c58c9ac33f0f206095ecfe3931cc6edb301f4b40480e3b44b0f39aea7a25fed8eef47e63523e7e670082947a3662cdc04c68ebbe5dfc89",
- "algorithm": "sha512",
- "filename": "rustc.tar.xz",
- "unpack": true
- }
-]
deleted file mode 100644
--- a/browser/config/tooltool-manifests/linux64/fuzzing.manifest
+++ /dev/null
@@ -1,18 +0,0 @@
-[
- {
- "version": "rustc 1.19.0 (0ade33941 2017-07-17) repack",
- "size": 161014632,
- "digest": "65bebcf94fc66ea618c58c9ac33f0f206095ecfe3931cc6edb301f4b40480e3b44b0f39aea7a25fed8eef47e63523e7e670082947a3662cdc04c68ebbe5dfc89",
- "algorithm": "sha512",
- "filename": "rustc.tar.xz",
- "unpack": true
- },
- {
- "size": 12072532,
- "digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
- "algorithm": "sha512",
- "filename": "gtk3.tar.xz",
- "setup": "setup.sh",
- "unpack": true
- }
-]
deleted file mode 100644
--- a/browser/config/tooltool-manifests/linux64/msan.manifest
+++ /dev/null
@@ -1,18 +0,0 @@
-[
- {
- "version": "rustc 1.19.0 (0ade33941 2017-07-17) repack",
- "size": 161014632,
- "digest": "65bebcf94fc66ea618c58c9ac33f0f206095ecfe3931cc6edb301f4b40480e3b44b0f39aea7a25fed8eef47e63523e7e670082947a3662cdc04c68ebbe5dfc89",
- "algorithm": "sha512",
- "filename": "rustc.tar.xz",
- "unpack": true
- },
- {
- "size": 12072532,
- "digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
- "algorithm": "sha512",
- "filename": "gtk3.tar.xz",
- "setup": "setup.sh",
- "unpack": true
- }
-]
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -371,17 +371,17 @@ linux64-asan/opt:
job-name: linux64-asan-opt
treeherder:
platform: linux64/asan
symbol: tc(Bo)
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
env:
PERFHERDER_EXTRA_OPTIONS: "opt asan"
- TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/asan.manifest"
+ TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
max-run-time: 36000
run:
using: mozharness
actions: [get-secrets build check-test update]
config:
- builds/releng_base_linux_64_builds.py
- balrog/production.py
script: "mozharness/scripts/fx_desktop_build.py"
@@ -402,17 +402,17 @@ linux64-asan-fuzzing/opt:
job-name: linux64-fuzzing-asan-opt
treeherder:
platform: linux64/asan
symbol: tc(Bof)
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
env:
PERFHERDER_EXTRA_OPTIONS: asan-fuzzing
- TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/fuzzing.manifest"
+ TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
max-run-time: 36000
run:
using: mozharness
actions: [get-secrets build check-test update]
config:
- builds/releng_base_linux_64_builds.py
- balrog/production.py
script: "mozharness/scripts/fx_desktop_build.py"
@@ -432,17 +432,17 @@ linux64-asan/debug:
job-name: linux64-asan-debug
treeherder:
platform: linux64/asan
symbol: tc(Bd)
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
env:
PERFHERDER_EXTRA_OPTIONS: "debug asan"
- TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/asan.manifest"
+ TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
max-run-time: 36000
run:
using: mozharness
actions: [get-secrets build check-test update]
config:
- builds/releng_base_linux_64_builds.py
- balrog/production.py
script: "mozharness/scripts/fx_desktop_build.py"
--- a/taskcluster/ci/spidermonkey/kind.yml
+++ b/taskcluster/ci/spidermonkey/kind.yml
@@ -131,17 +131,17 @@ jobs:
sm-asan/opt:
description: "Spidermonkey Address Sanitizer"
index:
job-name: sm-asan-opt
treeherder:
symbol: SM-tc(asan)
worker:
env:
- TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/asan.manifest"
+ TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run:
spidermonkey-variant: asan
sm-compacting/debug:
description: "Spidermonkey Compacting"
index:
job-name: sm-compacting-debug
treeherder:
@@ -153,17 +153,17 @@ jobs:
sm-msan/opt:
description: "Spidermonkey Memory Sanitizer"
index:
job-name: sm-msan-opt
treeherder:
symbol: SM-tc(msan)
worker:
env:
- TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/msan.manifest"
+ TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run:
spidermonkey-variant: msan
sm-tsan/opt:
description: "Spidermonkey Thread Sanitizer"
index:
job-name: sm-tsan-opt
treeherder:
--- a/taskcluster/ci/static-analysis/kind.yml
+++ b/taskcluster/ci/static-analysis/kind.yml
@@ -28,17 +28,17 @@ jobs:
job-name: linux64-st-an-debug
treeherder:
platform: linux64/debug
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
docker-image: {in-tree: desktop-build}
max-run-time: 36000
env:
- TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/clang.manifest.centos6"
+ TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run:
using: mozharness
actions: [build]
config:
- builds/releng_sub_linux_configs/64_stat_and_debug.py
- balrog/production.py
script: "mozharness/scripts/fx_desktop_build.py"
tooltool-downloads: public
@@ -53,17 +53,17 @@ jobs:
job-name: linux64-st-an-opt
treeherder:
platform: linux64/opt
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
docker-image: {in-tree: desktop-build}
max-run-time: 36000
env:
- TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/clang.manifest.centos6"
+ TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run:
using: mozharness
actions: [build]
config:
- builds/releng_sub_linux_configs/64_stat_and_opt.py
- balrog/production.py
script: "mozharness/scripts/fx_desktop_build.py"
tooltool-downloads: public
--- a/taskcluster/ci/toolchain/linux.yml
+++ b/taskcluster/ci/toolchain/linux.yml
@@ -210,17 +210,17 @@ linux64-sccache:
platform: toolchains/opt
symbol: TL(sccache)
tier: 1
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
docker-image: {in-tree: desktop-build}
max-run-time: 36000
env:
- TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/clang.manifest"
+ TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
run:
using: toolchain-script
script: build-sccache.sh
resources:
- 'taskcluster/scripts/misc/tooltool-download.sh'
toolchain-artifact: public/build/sccache2.tar.xz
toolchains:
- linux64-clang
--- a/taskcluster/docker/rust-build/splat_rust.py
+++ b/taskcluster/docker/rust-build/splat_rust.py
@@ -55,22 +55,17 @@ def update_manifest(source_manifest, tar
save_manifest(old, target_filename)
break
'''Mapping from targets to target filenames.'''
TARGETS = {
'x86_64-unknown-linux-gnu-repack': [
'browser/config/tooltool-manifests/linux32/releng.manifest',
- 'browser/config/tooltool-manifests/linux64/asan.manifest',
- 'browser/config/tooltool-manifests/linux64/clang.manifest',
- 'browser/config/tooltool-manifests/linux64/clang.manifest.centos6',
- 'browser/config/tooltool-manifests/linux64/fuzzing.manifest',
'browser/config/tooltool-manifests/linux64/hazard.manifest',
- 'browser/config/tooltool-manifests/linux64/msan.manifest',
'browser/config/tooltool-manifests/linux64/releng.manifest',
],
'x86_64-unknown-linux-gnu-android-cross-repack': [
'mobile/android/config/tooltool-manifests/android/releng.manifest',
'mobile/android/config/tooltool-manifests/android-x86/releng.manifest',
'mobile/android/config/tooltool-manifests/android-gradle-dependencies/releng.manifest',
],
'x86_64-unknown-linux-gnu-mingw32-cross-repack': [
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan.py
@@ -13,17 +13,17 @@ config = {
'sendchange',
'check-test',
# 'update',
],
'stage_platform': 'linux64-asan',
'publish_nightly_en_US_routes': False,
'build_type': 'asan',
'tooltool_manifest_src': "browser/config/tooltool-manifests/linux64/\
-asan.manifest",
+releng.manifest",
'platform_supports_post_upload_to_latest': False,
'enable_signing': False,
'enable_talos_sendchange': False,
#### 64 bit build specific #####
'env': {
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_and_debug.py
@@ -14,17 +14,17 @@ config = {
'check-test',
# 'update',
],
'stage_platform': 'linux64-asan-debug',
'publish_nightly_en_US_routes': False,
'build_type': 'asan-debug',
'debug_build': True,
'tooltool_manifest_src': "browser/config/tooltool-manifests/linux64/\
-asan.manifest",
+releng.manifest",
'platform_supports_post_upload_to_latest': False,
'enable_signing': False,
'enable_talos_sendchange': False,
#### 64 bit build specific #####
'env': {
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',