From 641c8d2b6f6b43081e4ffb7f6010bf13b4ece7b8 Mon Sep 17 00:00:00 2001 From: Justin Wood Date: Wed, 12 Feb 2020 22:44:40 +0000 Subject: [PATCH] Bug 1614999 - Rename devedition builds to not include nightly. r=aki Differential Revision: https://phabricator.services.mozilla.com/D62644 --HG-- extra : moz-landing-system : lando --- taskcluster/ci/build/linux.yml | 8 ++++---- taskcluster/ci/build/macosx.yml | 4 ++-- taskcluster/ci/build/windows.yml | 12 ++++++------ taskcluster/ci/release-update-verify-config/kind.yml | 12 ++++++------ taskcluster/ci/release-update-verify/kind.yml | 12 ++++++------ taskcluster/ci/shippable-l10n/kind.yml | 4 +++- taskcluster/ci/test/test-platforms.yml | 10 +++++----- 7 files changed, 32 insertions(+), 30 deletions(-) diff --git a/taskcluster/ci/build/linux.yml b/taskcluster/ci/build/linux.yml index 5b374e74869d..d1b6344106fd 100644 --- a/taskcluster/ci/build/linux.yml +++ b/taskcluster/ci/build/linux.yml @@ -196,8 +196,8 @@ linux64-plain/debug: - linux64-lucetc - wasi-sysroot -linux64-devedition-nightly/opt: - description: "Linux64 devedition Nightly" +linux64-devedition/opt: + description: "Linux64 devedition (shippable)" use-pgo: linux64-shippable/opt attributes: nightly: true @@ -552,8 +552,8 @@ linux-rusttests/debug: - linux64-lucetc - wasi-sysroot -linux-devedition-nightly/opt: - description: "Linux32 devedition Nightly" +linux-devedition/opt: + description: "Linux32 devedition (shippable)" use-pgo: linux-shippable/opt attributes: nightly: true diff --git a/taskcluster/ci/build/macosx.yml b/taskcluster/ci/build/macosx.yml index 86a50a4c9eee..71f13daea43d 100644 --- a/taskcluster/ci/build/macosx.yml +++ b/taskcluster/ci/build/macosx.yml @@ -176,8 +176,8 @@ macosx64-fuzzing/debug: - linux64-lucetc - wasi-sysroot -macosx64-devedition-nightly/opt: - description: "MacOS X Dev Edition x64 Nightly" +macosx64-devedition/opt: + description: "MacOS X Dev Edition x64 (shippable)" use-pgo: macosx64-shippable/opt attributes: nightly: true diff --git a/taskcluster/ci/build/windows.yml b/taskcluster/ci/build/windows.yml index a7a0e8360379..fb61c7d77487 100755 --- a/taskcluster/ci/build/windows.yml +++ b/taskcluster/ci/build/windows.yml @@ -853,8 +853,8 @@ win64-asan-fuzzing/opt: - win64-nasm - win64-node -win32-devedition-nightly/opt: - description: "Win32 Dev Edition Nightly" +win32-devedition/opt: + description: "Win32 Dev Edition (shippable)" use-pgo: win32-shippable/opt index: product: devedition @@ -906,8 +906,8 @@ win32-devedition-nightly/opt: - win64-nasm - win64-node -win64-devedition-nightly/opt: - description: "Win64 Dev Edition Nightly" +win64-devedition/opt: + description: "Win64 Dev Edition (shippable)" use-pgo: win64-shippable/opt index: product: devedition @@ -1200,8 +1200,8 @@ win64-aarch64-shippable-no-eme/opt: - win64-node -win64-aarch64-devedition-nightly/opt: - description: "AArch64 Win64 MSVC Devedition Nightly" +win64-aarch64-devedition/opt: + description: "AArch64 Win64 MSVC Devedition (shippable)" index: product: devedition job-name: win64-aarch64-opt diff --git a/taskcluster/ci/release-update-verify-config/kind.yml b/taskcluster/ci/release-update-verify-config/kind.yml index c704569577ad..5c1c52c583b3 100644 --- a/taskcluster/ci/release-update-verify-config/kind.yml +++ b/taskcluster/ci/release-update-verify-config/kind.yml @@ -225,7 +225,7 @@ jobs: kind: test tier: 1 attributes: - build_platform: linux-devedition-nightly + build_platform: linux-devedition extra: product: firefox platform: linux-i686 @@ -241,7 +241,7 @@ jobs: kind: test tier: 1 attributes: - build_platform: linux64-devedition-nightly + build_platform: linux64-devedition extra: product: firefox platform: linux-x86_64 @@ -257,7 +257,7 @@ jobs: kind: test tier: 1 attributes: - build_platform: macosx64-devedition-nightly + build_platform: macosx64-devedition extra: product: firefox platform: mac @@ -273,7 +273,7 @@ jobs: kind: test tier: 1 attributes: - build_platform: win32-devedition-nightly + build_platform: win32-devedition extra: product: firefox platform: win32 @@ -289,7 +289,7 @@ jobs: kind: test tier: 1 attributes: - build_platform: win64-devedition-nightly + build_platform: win64-devedition extra: product: firefox platform: win64 @@ -305,7 +305,7 @@ jobs: kind: test tier: 1 attributes: - build_platform: win64-aarch64-devedition-nightly + build_platform: win64-aarch64-devedition extra: product: firefox platform: win64-aarch64 diff --git a/taskcluster/ci/release-update-verify/kind.yml b/taskcluster/ci/release-update-verify/kind.yml index a25607369708..661477a509ec 100644 --- a/taskcluster/ci/release-update-verify/kind.yml +++ b/taskcluster/ci/release-update-verify/kind.yml @@ -78,34 +78,34 @@ jobs: description: linux64 update verify shipping-product: devedition attributes: - build_platform: linux64-devedition-nightly + build_platform: linux64-devedition devedition-linux: description: linux update verify shipping-product: devedition attributes: - build_platform: linux-devedition-nightly + build_platform: linux-devedition devedition-win64: description: win64 update verify shipping-product: devedition attributes: - build_platform: win64-devedition-nightly + build_platform: win64-devedition devedition-win64-aarch64: description: win64-aarch64 update verify shipping-product: devedition attributes: - build_platform: win64-aarch64-devedition-nightly + build_platform: win64-aarch64-devedition devedition-win32: description: win32 update verify shipping-product: devedition attributes: - build_platform: win32-devedition-nightly + build_platform: win32-devedition devedition-macosx64: description: macosx64 update verify shipping-product: devedition attributes: - build_platform: macosx64-devedition-nightly + build_platform: macosx64-devedition diff --git a/taskcluster/ci/shippable-l10n/kind.yml b/taskcluster/ci/shippable-l10n/kind.yml index 9fa2ff1a3ae7..ff5c56d0c97a 100644 --- a/taskcluster/ci/shippable-l10n/kind.yml +++ b/taskcluster/ci/shippable-l10n/kind.yml @@ -92,11 +92,13 @@ job-template: type: by-build-platform: .*nightly.*: nightly-l10n + # Defer swapping index's until a later patch + .*devedition.*: nightly-l10n default: shippable-l10n product: by-build-platform: default: firefox - .*-devedition-.*: devedition + .*-devedition: devedition android-api-16-nightly: mobile job-name: by-build-platform: diff --git a/taskcluster/ci/test/test-platforms.yml b/taskcluster/ci/test/test-platforms.yml index 3ba4ad7fedd0..0023a5798324 100644 --- a/taskcluster/ci/test/test-platforms.yml +++ b/taskcluster/ci/test/test-platforms.yml @@ -53,7 +53,7 @@ linux1804-64-shippable/opt: - web-platform-tests-wdspec-headless linux1804-64-devedition/opt: - build-platform: linux64-devedition-nightly/opt + build-platform: linux64-devedition/opt test-sets: - desktop-screenshot-capture - linux1804-tests @@ -134,7 +134,7 @@ linux64-shippable/opt: - talos-profiling linux64-devedition/opt: - build-platform: linux64-devedition-nightly/opt + build-platform: linux64-devedition/opt test-sets: - linux-common-tests - web-platform-tests-1604 @@ -221,7 +221,7 @@ windows7-32-shippable/opt: - browsertime windows7-32-devedition/opt: - build-platform: win32-devedition-nightly/opt + build-platform: win32-devedition/opt test-sets: - desktop-screenshot-capture - windows-reftest-gpu @@ -295,7 +295,7 @@ windows10-64-shippable/opt: - talos-profiling windows10-64-devedition/opt: - build-platform: win64-devedition-nightly/opt + build-platform: win64-devedition/opt test-sets: - desktop-screenshot-capture - marionette-gpu-tests @@ -379,7 +379,7 @@ macosx1014-64/debug: - macosx1014-64-tests macosx1014-64-devedition/opt: - build-platform: macosx64-devedition-nightly/opt + build-platform: macosx64-devedition/opt test-sets: - macosx1014-64-tests