No bug: [mozharness] Remove references to balrog in mozharness; r=bhearsum

There are two places where it is references:

- The build process generates a `balrog_props.json` that is not used anywhere.
  (This is currently generated as part of beetmover).
- The merge day scripts have unused support for locking some rules.

Differential Revision: https://phabricator.services.mozilla.com/D6170

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Tom Prince 2018-09-19 18:54:44 +00:00
parent ef41380ad1
commit a7c3a25c9b
41 changed files with 55 additions and 192 deletions

View File

@ -37,7 +37,7 @@ android-api-16/debug:
type: directory
run:
using: mozharness
actions: [get-secrets build multi-l10n update]
actions: [get-secrets build multi-l10n]
config:
- builds/releng_base_android_64_builds.py
script: "mozharness/scripts/fx_desktop_build.py"
@ -97,7 +97,7 @@ android-api-16-ccov/debug:
type: directory
run:
using: mozharness
actions: [get-secrets build multi-l10n update]
actions: [get-secrets build multi-l10n]
config:
- builds/releng_base_android_64_builds.py
script: "mozharness/scripts/fx_desktop_build.py"
@ -155,7 +155,7 @@ android-x86/opt:
type: directory
run:
using: mozharness
actions: [get-secrets build multi-l10n update]
actions: [get-secrets build multi-l10n]
config:
- builds/releng_base_android_64_builds.py
script: "mozharness/scripts/fx_desktop_build.py"
@ -206,7 +206,7 @@ android-x86-fuzzing/debug:
type: directory
run:
using: mozharness
actions: [get-secrets build multi-l10n update]
actions: [get-secrets build multi-l10n]
config:
- builds/releng_base_android_64_builds.py
script: "mozharness/scripts/fx_desktop_build.py"
@ -267,7 +267,7 @@ android-x86-nightly/opt:
type: directory
run:
using: mozharness
actions: [get-secrets build multi-l10n update]
actions: [get-secrets build multi-l10n]
config:
- builds/releng_base_android_64_builds.py
- taskcluster_nightly.py
@ -325,7 +325,7 @@ android-api-16/opt:
type: directory
run:
using: mozharness
actions: [get-secrets build multi-l10n update]
actions: [get-secrets build multi-l10n]
config:
- builds/releng_base_android_64_builds.py
script: "mozharness/scripts/fx_desktop_build.py"
@ -378,7 +378,7 @@ android-api-16-without-google-play-services/opt:
type: directory
run:
using: mozharness
actions: [get-secrets build multi-l10n update]
actions: [get-secrets build multi-l10n]
config:
- builds/releng_base_android_64_builds.py
script: "mozharness/scripts/fx_desktop_build.py"
@ -440,7 +440,7 @@ android-api-16-nightly/opt:
type: directory
run:
using: mozharness
actions: [get-secrets build multi-l10n update]
actions: [get-secrets build multi-l10n]
config:
- builds/releng_base_android_64_builds.py
- taskcluster_nightly.py
@ -498,7 +498,7 @@ android-aarch64/opt:
type: directory
run:
using: mozharness
actions: [get-secrets build multi-l10n update]
actions: [get-secrets build multi-l10n]
config:
- builds/releng_base_android_64_builds.py
script: "mozharness/scripts/fx_desktop_build.py"
@ -559,7 +559,7 @@ android-aarch64-nightly/opt:
type: directory
run:
using: mozharness
actions: [get-secrets build multi-l10n update]
actions: [get-secrets build multi-l10n]
config:
- builds/releng_base_android_64_builds.py
- taskcluster_nightly.py
@ -617,7 +617,7 @@ android-x86_64/opt:
type: directory
run:
using: mozharness
actions: [get-secrets build multi-l10n update]
actions: [get-secrets build multi-l10n]
config:
- builds/releng_base_android_64_builds.py
script: "mozharness/scripts/fx_desktop_build.py"
@ -678,7 +678,7 @@ android-x86_64-nightly/opt:
type: directory
run:
using: mozharness
actions: [get-secrets build multi-l10n update]
actions: [get-secrets build multi-l10n]
config:
- builds/releng_base_android_64_builds.py
- taskcluster_nightly.py

View File

@ -13,7 +13,7 @@ linux64/opt:
max-run-time: 7200
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_64_builds.py
@ -74,7 +74,7 @@ linux64-dmd/opt:
max-run-time: 3600
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_64_builds.py
@ -109,7 +109,7 @@ linux64/pgo:
max-run-time: 7200
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
options: [enable-pgo]
config:
- builds/releng_base_firefox.py
@ -143,7 +143,7 @@ linux64-fuzzing/debug:
FORCE_GCC: '1'
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_64_builds.py
@ -176,7 +176,7 @@ linux64/debug:
max-run-time: 3600
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_64_builds.py
@ -243,7 +243,7 @@ linux64-devedition-nightly/opt:
max-run-time: 7200
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_64_builds.py
@ -279,7 +279,7 @@ linux64-base-toolchains/opt:
FORCE_GCC: '1'
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_64_builds.py
@ -311,7 +311,7 @@ linux64-base-toolchains/debug:
FORCE_GCC: '1'
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_64_builds.py
@ -344,7 +344,7 @@ linux/opt:
max-run-time: 7200
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_32_builds.py
@ -377,7 +377,7 @@ linux/debug:
max-run-time: 3600
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_32_builds.py
@ -411,7 +411,7 @@ linux/pgo:
max-run-time: 7200
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
options: [enable-pgo]
config:
- builds/releng_base_firefox.py
@ -446,7 +446,7 @@ linux-rusttests/opt:
PERFHERDER_EXTRA_OPTIONS: rusttests
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_32_builds.py
@ -482,7 +482,7 @@ linux-rusttests/debug:
PERFHERDER_EXTRA_OPTIONS: rusttests
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_32_builds.py
@ -521,7 +521,7 @@ linux-devedition-nightly/opt:
max-run-time: 7200
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_32_builds.py
@ -561,7 +561,7 @@ linux-nightly/opt:
max-run-time: 7200
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_32_builds.py
@ -594,7 +594,7 @@ linux64-asan/opt:
max-run-time: 3600
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_64_builds.py
@ -627,7 +627,7 @@ linux64-asan-fuzzing/opt:
max-run-time: 3600
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_64_builds.py
@ -661,7 +661,7 @@ linux64-asan-fuzzing-ccov/opt:
max-run-time: 3600
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_64_builds.py
@ -697,7 +697,7 @@ linux64-fuzzing-ccov/opt:
FORCE_GCC: '1'
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_64_builds.py
@ -734,7 +734,7 @@ linux64-asan-reporter-nightly/opt:
max-run-time: 3600
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_64_builds.py
@ -768,7 +768,7 @@ linux64-asan/debug:
max-run-time: 3600
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_64_builds.py
@ -805,7 +805,7 @@ linux64-nightly/opt:
max-run-time: 7200
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_64_builds.py
@ -837,7 +837,7 @@ linux64-noopt/debug:
max-run-time: 3600
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_64_builds.py
@ -873,7 +873,7 @@ linux64-rusttests/opt:
PERFHERDER_EXTRA_OPTIONS: rusttests
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_64_builds.py
@ -908,7 +908,7 @@ linux64-rusttests/debug:
PERFHERDER_EXTRA_OPTIONS: rusttests
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_64_builds.py
@ -943,7 +943,7 @@ linux64-tup/opt:
PERFHERDER_EXTRA_OPTIONS: tup
run:
using: mozharness
actions: [get-secrets build update]
actions: [get-secrets build]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_64_builds.py
@ -976,7 +976,7 @@ linux64-jsdcov/opt:
max-run-time: 7200
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_64_builds.py
@ -1009,7 +1009,7 @@ linux64-ccov/debug:
FORCE_GCC: '1'
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_64_builds.py
@ -1043,7 +1043,7 @@ linux64-ccov/opt:
FORCE_GCC: '1'
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_64_builds.py
@ -1074,7 +1074,7 @@ linux64-add-on-devel/opt:
max-run-time: 3600
run:
using: mozharness
actions: [get-secrets build check-test update]
actions: [get-secrets build check-test]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_64_builds.py

View File

@ -16,7 +16,7 @@ macosx64/debug:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
run:
using: mozharness
actions: [get-secrets build update]
actions: [get-secrets build]
config:
- builds/releng_base_firefox.py
- builds/releng_base_mac_64_cross_builds.py
@ -54,7 +54,7 @@ macosx64/opt:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
run:
using: mozharness
actions: [get-secrets build update]
actions: [get-secrets build]
config:
- builds/releng_base_firefox.py
- builds/releng_base_mac_64_cross_builds.py
@ -89,7 +89,7 @@ macosx64-asan-fuzzing/opt:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
run:
using: mozharness
actions: [get-secrets build update]
actions: [get-secrets build]
config:
- builds/releng_base_firefox.py
- builds/releng_base_mac_64_cross_builds.py
@ -125,7 +125,7 @@ macosx64-dmd/opt:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
run:
using: mozharness
actions: [get-secrets build update]
actions: [get-secrets build]
config:
- builds/releng_base_firefox.py
- builds/releng_base_mac_64_cross_builds.py
@ -169,7 +169,7 @@ macosx64-devedition-nightly/opt:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
run:
using: mozharness
actions: [get-secrets build update]
actions: [get-secrets build]
config:
- builds/releng_base_firefox.py
- builds/releng_base_mac_64_cross_builds.py
@ -207,7 +207,7 @@ macosx64-noopt/debug:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
run:
using: mozharness
actions: [get-secrets build update]
actions: [get-secrets build]
config:
- builds/releng_base_firefox.py
- builds/releng_base_mac_64_cross_builds.py
@ -245,7 +245,7 @@ macosx64-add-on-devel/opt:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
run:
using: mozharness
actions: [get-secrets build update]
actions: [get-secrets build]
config:
- builds/releng_base_firefox.py
- builds/releng_base_mac_64_cross_builds.py
@ -288,7 +288,7 @@ macosx64-nightly/opt:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
run:
using: mozharness
actions: [get-secrets build update]
actions: [get-secrets build]
config:
- builds/releng_base_firefox.py
- builds/releng_base_mac_64_cross_builds.py
@ -324,7 +324,7 @@ macosx64-ccov/debug:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
run:
using: mozharness
actions: [get-secrets build update]
actions: [get-secrets build]
config:
- builds/releng_base_firefox.py
- builds/releng_base_mac_64_cross_builds.py

View File

@ -328,7 +328,7 @@ win32-nightly/opt:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
run:
using: mozharness
actions: [build, check-test, update]
actions: [build, check-test]
options: [append-env-variables-from-configs]
script: mozharness/scripts/fx_desktop_build.py
config:
@ -367,7 +367,7 @@ win64-nightly/opt:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
run:
using: mozharness
actions: [build, check-test, update]
actions: [build, check-test]
options: [append-env-variables-from-configs]
script: mozharness/scripts/fx_desktop_build.py
config:

View File

@ -8,7 +8,6 @@ config = {
'default_actions': [
'build',
'multi-l10n',
'update', # decided by query_is_nightly()
],
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
'max_build_output_timeout': 0,

View File

@ -13,7 +13,6 @@ config = {
'clobber',
'build',
'check-test',
'update', # decided by query_is_nightly()
],
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
# decides whether we want to use moz_sign_cmd in env

View File

@ -12,7 +12,6 @@ config = {
'clobber',
'build',
'check-test',
'update', # decided by query_is_nightly()
],
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
# decides whether we want to use moz_sign_cmd in env

View File

@ -7,7 +7,6 @@ config = {
# note: overridden by MOZHARNESS_ACTIONS in TaskCluster tasks
'default_actions': [
'build',
'update', # decided by query_is_nightly()
],
'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
# decides whether we want to use moz_sign_cmd in env

View File

@ -5,7 +5,6 @@ config = {
'clobber',
'build',
'check-test',
'update', # decided by query_is_nightly()
],
'debug_build': True,
'stage_platform': 'linux-debug',

View File

@ -5,7 +5,6 @@ config = {
'clobber',
'build',
'check-test',
# 'update',
],
'stage_platform': 'linux64-add-on-devel',
#### 64 bit build specific #####

View File

@ -5,7 +5,6 @@ config = {
'clobber',
'build',
'check-test',
# 'update',
],
'stage_platform': 'linux64-asan',
#### 64 bit build specific #####

View File

@ -5,7 +5,6 @@ config = {
'clobber',
'build',
'check-test',
# 'update',
],
'stage_platform': 'linux64-asan-debug',
'debug_build': True,

View File

@ -5,7 +5,6 @@ config = {
'clobber',
'build',
'check-test',
# 'update',
],
'stage_platform': 'linux64-asan-reporter',
#### 64 bit build specific #####

View File

@ -5,7 +5,6 @@ config = {
'clobber',
'build',
'check-test',
# 'update',
],
'stage_platform': 'linux64-asan',
#### 64 bit build specific #####

View File

@ -5,7 +5,6 @@ config = {
'clobber',
'build',
'check-test',
# 'update',
],
'stage_platform': 'linux64-asan-debug',
'debug_build': True,

View File

@ -5,7 +5,6 @@ config = {
'clobber',
'build',
'check-test',
'update', # decided by query_is_nightly()
],
'stage_platform': 'linux64-ccov',
#### 64 bit build specific #####

View File

@ -5,7 +5,6 @@ config = {
'clobber',
'build',
'check-test',
'update', # decided by query_is_nightly()
],
'stage_platform': 'linux64-ccov',
#### 64 bit build specific #####

View File

@ -5,7 +5,6 @@ config = {
'clobber',
'build',
'check-test',
'update', # decided by query_is_nightly()
],
'stage_platform': 'linux64-debug',
'debug_build': True,

View File

@ -5,7 +5,6 @@ config = {
'clobber',
'build',
'check-test',
# 'update',
],
'stage_platform': 'linux64-fuzzing-asan',
#### 64 bit build specific #####

View File

@ -5,7 +5,6 @@ config = {
'clobber',
'build',
'check-test',
'update', # decided by query_is_nightly()
],
'stage_platform': 'linux64-noopt-debug',
'debug_build': True,

View File

@ -5,7 +5,6 @@ config = {
'clobber',
'build',
'check-test',
# 'update',
],
'stage_platform': 'linux64-rusttests',
#### 64 bit build specific #####

View File

@ -4,7 +4,6 @@ config = {
'default_actions': [
'clobber',
'build',
'update', # decided by query_is_nightly()
],
'stage_platform': 'linux64-tup-opt',
'enable_talos_sendchange': False,

View File

@ -6,7 +6,6 @@ config = {
'build',
'check-test',
'valgrind-test',
#'update',
],
'stage_platform': 'linux64-valgrind',
#### 64 bit build specific #####

View File

@ -5,7 +5,6 @@ config = {
'clobber',
'build',
'check-test',
# 'update',
],
'stage_platform': 'macosx64-add-on-devel',
#### 64 bit build specific #####

View File

@ -5,7 +5,6 @@ config = {
'clobber',
'build',
'check-test',
'update', # decided by query_is_nightly()
],
'stage_platform': 'macosx64-ccov-debug',
'debug_build': True,

View File

@ -3,7 +3,6 @@ import os
config = {
'default_actions': [
'build',
'update', # decided by query_is_nightly()
],
'stage_platform': 'macosx64-debug',
'debug_build': True,

View File

@ -4,7 +4,6 @@ config = {
'default_actions': [
'clobber',
'build',
'update', # decided by query_is_nightly()
],
'stage_platform': 'macosx64-searchfox-debug',
'debug_build': True,

View File

@ -4,7 +4,6 @@ config = {
'default_actions': [
'clobber',
'build',
'update', # decided by query_is_nightly()
],
'stage_platform': 'macosx64-noopt-debug',
'debug_build': True,

View File

@ -5,7 +5,6 @@ config = {
'clobber',
'build',
'check-test',
'update', # decided by query_is_nightly()
],
'stage_platform': 'macosx64-debug',
'debug_build': True,

View File

@ -4,7 +4,6 @@ config = {
'default_actions': [
'clobber',
'build',
'update', # decided by query_is_nightly()
],
'debug_build': True,
'stage_platform': 'macosx64-st-an-debug',

View File

@ -5,7 +5,6 @@ config = {
'clobber',
'build',
'check-test',
# 'update',
],
'stage_platform': 'win32-add-on-devel',
#### 32 bit build specific #####

View File

@ -5,7 +5,6 @@ config = {
'clobber',
'build',
'check-test',
'update', # decided by query_is_nightly()
],
'stage_platform': 'win32-debug',
'debug_build': True,

View File

@ -4,7 +4,6 @@ config = {
'default_actions': [
'clobber',
'build',
'update', # decided by query_is_nightly()
],
'stage_platform': 'win32-st-an-debug',
'debug_build': True,

View File

@ -5,7 +5,6 @@ config = {
'clobber',
'build',
'check-test',
# 'update',
],
'stage_platform': 'win64-add-on-devel',
#### 64 bit build specific #####

View File

@ -5,7 +5,6 @@ config = {
'clobber',
'build',
'check-test',
'update', # decided by query_is_nightly()
],
'stage_platform': 'win64-debug',
'debug_build': True,

View File

@ -2,7 +2,6 @@ config = {
'default_actions': [
'build',
'check-test',
'update',
],
'stage_platform': 'win32',
'mozconfig_variant': 'nightly',

View File

@ -2,7 +2,6 @@ config = {
'default_actions': [
'build',
'check-test',
'update',
],
'stage_platform': 'win64',
'mozconfig_variant': 'nightly',

View File

@ -41,7 +41,6 @@ from mozharness.mozilla.automation import (
from mozharness.mozilla.secrets import SecretsMixin
from mozharness.mozilla.testing.errors import TinderBoxPrintRe
from mozharness.mozilla.testing.unittest import tbox_print_summary
from mozharness.mozilla.updates.balrog import BalrogMixin
from mozharness.base.python import (
PerfherderResourceOptionsMixin,
VirtualenvMixin,
@ -671,7 +670,7 @@ def generate_build_UID():
return uuid.uuid4().hex
class BuildScript(AutomationMixin, BalrogMixin,
class BuildScript(AutomationMixin,
VirtualenvMixin, MercurialScript,
SecretsMixin, PerfherderResourceOptionsMixin):
def __init__(self, **kwargs):
@ -1769,28 +1768,6 @@ or run without that action (ie: --no-{action})"
if perfherder_data["suites"]:
self.info('PERFHERDER_DATA: %s' % json.dumps(perfherder_data))
def update(self):
""" submit balrog update steps. """
if self.config.get('forced_artifact_build'):
self.info('Skipping due to forced artifact build.')
return
if not self.query_is_nightly():
self.info("Not a nightly build, skipping balrog submission.")
return
# grab any props available from this or previous unclobbered runs
self.generate_build_props(console_output=False,
halt_on_failure=False)
# generate balrog props as artifacts
if self.config.get('taskcluster_nightly'):
env = self.query_mach_build_env(multiLocale=False)
props_path = os.path.join(env["UPLOAD_PATH"],
'balrog_props.json')
self.generate_balrog_props(props_path)
return
def valgrind_test(self):
'''Execute mach's valgrind-test for memory leaks'''
env = self.query_build_env()

View File

@ -1,57 +0,0 @@
import os
import sys
from mozharness.base.log import INFO
# BalrogMixin {{{1
class BalrogMixin(object):
def query_python(self):
return sys.executable
def generate_balrog_props(self, props_path):
balrog_props = {}
balrog_props.update(self.properties)
balrog_props['hashType'] = self.config.get("hash_type", "sha512")
if self.config.get('stage_platform'):
balrog_props['stage_platform'] = self.config['stage_platform']
if self.config.get('platform'):
balrog_props['platform'] = self.config['platform']
if self.config.get('balrog_platform'):
balrog_props["platform"] = self.config['balrog_platform']
if "branch" not in balrog_props:
balrog_props["branch"] = self.branch
self.dump_config(props_path, {"properties": balrog_props})
def lock_balrog_rules(self, rule_ids):
c = self.config
dirs = self.query_abs_dirs()
submitter_script = os.path.join(
dirs["abs_tools_dir"], "scripts", "updates",
"balrog-nightly-locker.py"
)
credentials_file = os.path.join(
dirs["base_work_dir"], c["balrog_credentials_file"]
)
cmd = [
self.query_python(),
submitter_script,
"--credentials-file", credentials_file,
"--api-root", c["balrog_api_root"],
"--username", c["balrog_username"],
]
for r in rule_ids:
cmd.extend(["-r", str(r)])
if self._log_level_at_least(INFO):
cmd.append("--verbose")
cmd.append("lock")
self.info("Calling Balrog rule locking script.")
self.retry(self.run_command, attempts=5, args=cmd,
kwargs={"halt_on_failure": True})

View File

@ -41,7 +41,6 @@ class FxDesktopBuild(BuildScript, TryToolsMixin, object):
'valgrind-test',
'multi-l10n',
'package-source',
'update',
],
'require_config_file': True,
# Default configuration

View File

@ -26,7 +26,6 @@ sys.path.insert(1, os.path.dirname(os.path.dirname(sys.path[0])))
from mozharness.base.errors import HgErrorList
from mozharness.base.python import VirtualenvMixin, virtualenv_config_options
from mozharness.base.vcs.vcsbase import MercurialScript
from mozharness.mozilla.updates.balrog import BalrogMixin
from mozharness.mozilla.automation import AutomationMixin
from mozharness.mozilla.repo_manipulation import MercurialRepoManipulationMixin
@ -37,7 +36,7 @@ VALID_MIGRATION_BEHAVIORS = (
# GeckoMigration {{{1
class GeckoMigration(MercurialScript, BalrogMixin, VirtualenvMixin,
class GeckoMigration(MercurialScript, VirtualenvMixin,
AutomationMixin, MercurialRepoManipulationMixin):
config_options = [
[['--hg-user', ], {
@ -54,24 +53,6 @@ class GeckoMigration(MercurialScript, BalrogMixin, VirtualenvMixin,
"default": None,
"help": "The user to push to hg.mozilla.org as.",
}],
[['--balrog-api-root', ], {
"action": "store",
"dest": "balrog_api_root",
"type": "string",
"help": "Specify Balrog API root URL.",
}],
[['--balrog-username', ], {
"action": "store",
"dest": "balrog_username",
"type": "string",
"help": "Specify what user to connect to Balrog with.",
}],
[['--balrog-credentials-file', ], {
"action": "store",
"dest": "balrog_credentials_file",
"type": "string",
"help": "The file containing the Balrog credentials.",
}],
[['--remove-locale', ], {
"action": "extend",
"dest": "remove_locales",
@ -89,7 +70,6 @@ class GeckoMigration(MercurialScript, BalrogMixin, VirtualenvMixin,
'create-virtualenv',
'clean-repos',
'pull',
'lock-update-paths',
'set_push_to_ssh',
'migrate',
'bump_second_digit',
@ -474,9 +454,6 @@ class GeckoMigration(MercurialScript, BalrogMixin, VirtualenvMixin,
}] + self.query_repos()
super(GeckoMigration, self).pull(repos=repos)
def lock_update_paths(self):
self.lock_balrog_rules(self.config["balrog_rules_to_lock"])
def migrate(self):
""" Perform the migration.
"""