Bug 1392522 - prevent staging infrastructure grab mozilla-beta as repo r=jlorenzo
MozReview-Commit-ID: BAg0sCjTAfe
--- a/manifests/moco-config.pp
+++ b/manifests/moco-config.pp
@@ -266,16 +266,17 @@ class config inherits config::base {
balrog_username => 'balrog-stage-ffxbld',
balrog_password => secret('balrog-stage-ffxbld_ldap_password'),
beetmover_aws_access_key_id => secret('stage-beetmover-aws_access_key_id'),
beetmover_aws_secret_access_key => secret('stage-beetmover-aws_secret_access_key'),
releaserunner_buildbot_configs_branch => 'default',
releaserunner_buildbot_configs => 'https://hg.mozilla.org/build/buildbot-configs',
releaserunner_gpg_key_path => 'scripts/release/KEY',
releaserunner_config_file => 'release-runner.yml',
+ allowed_branches => [ 'projects/jamun' ],
},
'prod-old' => {
ship_it_root => 'https://ship-it.mozilla.org',
ship_it_username => secret('releaserunner_prod_ship_it_username'),
ship_it_password => secret('releaserunner_prod_ship_it_password'),
notify_to => 'Release Notifications <release-automation-notifications@mozilla.com>',
notify_to_announce => 'Release Co-ordination <release-drivers@mozilla.org>',
taskcluster_client_id => secret('releaserunner_prod_taskcluster_client_id'),
@@ -300,16 +301,21 @@ class config inherits config::base {
balrog_username => 'balrog-ffxbld',
balrog_password => secret('balrog-ffxbld_ldap_password'),
beetmover_aws_access_key_id => secret('beetmover-aws_access_key_id'),
beetmover_aws_secret_access_key => secret('beetmover-aws_secret_access_key'),
releaserunner_buildbot_configs_branch => 'production',
releaserunner_buildbot_configs => 'https://hg.mozilla.org/build/buildbot-configs',
releaserunner_gpg_key_path => 'scripts/release/KEY',
releaserunner_config_file => 'release-runner.yml',
+ allowed_branches => [
+ 'releases/mozilla-release',
+ 'releases/mozilla-beta',
+ 'releases/mozilla-esr*',
+ ],
}
}
$slaveapi_slavealloc_url = 'http://slavealloc.build.mozilla.org/api/'
$slaveapi_inventory_url = 'https://inventory.mozilla.org/en-US/tasty/v3/'
$slaveapi_inventory_username = 'releng-inventory-automation'
$slaveapi_buildapi_url = 'http://buildapi.pvt.build.mozilla.org/buildapi/'
$slaveapi_bugzilla_username = 'slaveapi@mozilla.releng.tld'
--- a/modules/releaserunner/templates/release-runner.yml.erb
+++ b/modules/releaserunner/templates/release-runner.yml.erb
@@ -49,18 +49,18 @@ signing:
releases:
- product: firefox
pattern: Firefox-.*
checks:
- long_revision
- l10n_changesets
- partial_updates
+ - check_allowed_branches
+ allowed_branches: <%= require "json"; JSON.generate(Array(@env_config["allowed_branches"])) %>
- product: devedition
pattern: Devedition-.*
checks:
- long_revision
- l10n_changesets
- partial_updates
-# - product: fennec
-# pattern: Fennec-.*
-# checks:
-# - long_revision
+ - check_allowed_branches
+ allowed_branches: <%= require "json"; JSON.generate(Array(@env_config["allowed_branches"])) %>