--- a/manifests/moco-config.pp
+++ b/manifests/moco-config.pp
@@ -320,80 +320,33 @@ class config inherits config::base {
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*',
],
- firefox_pattern => 'Firefox-.*',
- devedition_pattern => 'Devedition-.*',
- }
- }
-
- $releaserunner2_env_config = {
- 'dev-fennec' => {
- ship_it_root => 'https://ship-it-dev.allizom.org',
- ship_it_username => secret('releaserunner_dev_ship_it_username'),
- ship_it_password => secret('releaserunner_dev_ship_it_password'),
- notify_to => 'Release Notifications Dev <release-automation-notifications-dev@mozilla.com>',
- notify_to_announce => 'Release Notifications Dev <release-automation-notifications-dev@mozilla.com>',
- taskcluster_client_id => secret('releaserunner_dev_taskcluster_client_id'),
- taskcluster_access_token => secret('releaserunner_dev_taskcluster_access_token'),
- 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', 'projects/maple' ],
- releasetasks_relconfigs_prefix => 'dev',
- fennec_pattern => 'Fennec-5[67].*',
- },
- 'prod-fennec' => {
- 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 Signoff <release-signoff@mozilla.org>',
- taskcluster_client_id => secret('releaserunner_prod_taskcluster_client_id'),
- taskcluster_access_token => secret('releaserunner_prod_taskcluster_access_token'),
- 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*',
- ],
- releasetasks_relconfigs_prefix => 'prod',
- fennec_pattern => 'Fennec-5[67].*',
+ firefox_pattern => 'Firefox-58.*',
+ devedition_pattern => 'Devedition-58.*',
}
}
$releaserunner3_env_config = {
'dev' => {
ship_it_root => 'https://ship-it-dev.allizom.org',
ship_it_username => secret('releaserunner_dev_ship_it_username'),
ship_it_password => secret('releaserunner_dev_ship_it_password'),
notify_to => 'Release Notifications Dev <release-automation-notifications-dev@mozilla.com>',
notify_to_announce => 'Release Notifications Dev <release-automation-notifications-dev@mozilla.com>',
taskcluster_client_id => secret('releaserunner_dev_taskcluster_client_id'),
taskcluster_access_token => secret('releaserunner_dev_taskcluster_access_token'),
releaserunner_config_file => 'release-runner.yml',
allowed_branches => [ 'projects/jamun', 'projects/maple', 'projects/birch' ],
- fennec_pattern => 'Fennec-(5[89]|6[0-9]).*',
+ fennec_pattern => 'Fennec-.*',
firefox_pattern => 'Firefox-(5[89]|6[0-9]).*',
devedition_pattern => 'Devedition-(5[89]|6[0-9]).*',
},
'prod' => {
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>',
@@ -401,19 +354,19 @@ class config inherits config::base {
taskcluster_client_id => secret('releaserunner_prod_taskcluster_client_id'),
taskcluster_access_token => secret('releaserunner_prod_taskcluster_access_token'),
releaserunner_config_file => 'release-runner.yml',
allowed_branches => [
'releases/mozilla-release',
'releases/mozilla-beta',
'releases/mozilla-esr*',
],
- fennec_pattern => 'Fennec-5[89].*',
- firefox_pattern => 'FIXME',
- devedition_pattern => 'FIXME',
+ fennec_pattern => 'Fennec-.*',
+ firefox_pattern => 'Firefox-(5[9]|6[0-9]).*',
+ devedition_pattern => 'Devedition-(5[9]|6[0-9]).*',
}
}
$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/'
--- a/manifests/moco-nodes.pp
+++ b/manifests/moco-nodes.pp
@@ -636,28 +636,26 @@ node 'buildbot-master82.bb.releng.scl3.m
include toplevel::mixin::buildbot_bridge
include toplevel::mixin::buildbot_bridge2
}
node 'buildbot-master83.bb.releng.scl3.mozilla.com' {
$aspects = [ 'high-security' ]
$only_user_ssh = true
$releaserunner_env = 'dev'
- $releaserunner2_env = 'dev-fennec'
$releaserunner3_env = 'dev'
buildmaster::buildbot_master::mozilla {
'bm83-try1':
http_port => 8101,
master_type => 'try',
basedir => 'try1';
}
include fw::profiles::buildbot_master
include toplevel::server::buildmaster::mozilla
include toplevel::mixin::releaserunner
- include toplevel::mixin::releaserunner2
include toplevel::mixin::releaserunner3
}
node 'buildbot-master84.bb.releng.scl3.mozilla.com' {
$aspects = [ 'high-security' ]
$only_user_ssh = true
$buildbot_bridge_env = 'dev'
$buildbot_bridge2_env = 'dev'
@@ -672,28 +670,26 @@ node 'buildbot-master84.bb.releng.scl3.m
include toplevel::mixin::buildbot_bridge
include toplevel::mixin::buildbot_bridge2
}
node 'buildbot-master85.bb.releng.scl3.mozilla.com' {
$aspects = [ 'high-security' ]
$only_user_ssh = true
$releaserunner_env = 'prod'
- $releaserunner2_env = 'prod-fennec'
$releaserunner3_env = 'prod'
buildmaster::buildbot_master::mozilla {
'bm85-build1':
http_port => 8001,
master_type => 'build',
basedir => 'build1';
}
include fw::profiles::buildbot_master
include toplevel::server::buildmaster::mozilla
include toplevel::mixin::releaserunner
- include toplevel::mixin::releaserunner2
include toplevel::mixin::releaserunner3
}
node 'buildbot-master86.bb.releng.scl3.mozilla.com' {
$aspects = [ 'high-security' ]
$only_user_ssh = true
$buildbot_bridge_env = 'prod'
$buildbot_bridge2_env = 'prod'
--- a/modules/config/manifests/base.pp
+++ b/modules/config/manifests/base.pp
@@ -247,17 +247,16 @@ class config::base {
# mercurial repository and branch for buildbotcustom
$releaserunner_buildbotcustom_branch = 'production-0.8'
$releaserunner_buildbotcustom = 'https://hg.mozilla.org/build/buildbotcustom'
# mercurial repository and branch for tools
$releaserunner_tools = 'https://hg.mozilla.org/build/tools'
$releaserunner_tools_branch = 'default'
# root directory for releaserunner; this must be under /builds
$releaserunner_root = '/builds/releaserunner'
- $releaserunner2_root = '/builds/releaserunner2'
$releaserunner3_root = '/builds/releaserunner3'
$releaserunner_env_config = {
'dev' => {
ship_it_root => '',
ship_it_username => '',
ship_it_password => '',
notify_to => '',
@@ -271,37 +270,16 @@ class config::base {
ship_it_password => '',
notify_to => '',
notify_to_announce => '',
taskcluster_client_id => '',
taskcluster_access_token => '',
}
}
- $releaserunner2_env_config = {
- 'dev-fennec' => {
- ship_it_root => '',
- ship_it_username => '',
- ship_it_password => '',
- notify_to => '',
- notify_to_announce => '',
- taskcluster_client_id => '',
- taskcluster_access_token => '',
- },
- 'prod-fennec' => {
- ship_it_root => '',
- ship_it_username => '',
- ship_it_password => '',
- notify_to => '',
- notify_to_announce => '',
- taskcluster_client_id => '',
- taskcluster_access_token => '',
- }
- }
-
$releaserunner3_env_config = {
'dev' => {
ship_it_root => '',
ship_it_username => '',
ship_it_password => '',
notify_to => '',
notify_to_announce => '',
taskcluster_client_id => '',
deleted file mode 100644
--- a/modules/releaserunner2/files/docker-worker-pub.pem
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
-Comment: GPGTools - https://gpgtools.org
-
-mQENBFSJo6QBCADTRqsq4bhOYMzVpzz7wVzHhBejbKS9g9UIoZr5Kv/z0kA4C3kH
-rMXUJuqrwYzjq2PmA1VMDJjdAs2Vqa3ZQocj43PYdGHLvXpoe+l8v3BdvWFb2vsW
-GWsBj9DChexeCP1QodbXnIX+5/KR4K282ZIugnJ35HJPod/ytNYr9b3e2iQaJWb3
-S3UBfOQlVfUBzLVSumaxHCcc8bTEgiNHOzZYsr8AA9Q/y/wDCdeSYSISOLOYHtt/
-1qSEbzkU3kd5y9Gqp/OHjD1HSeCfZvCXjoqxdA8Wm1W4ffgusyR+SMiqX/trdNrf
-txcmGawPQFbkQDYbck6kdN6M5aRUDLmiNI2pABEBAAG0KURvY2tlciBXb3JrZXIg
-PGRvY2tlci13b3JrZXJAbW96aWxsYS5jb20+iQE3BBMBCgAhBQJUiaOkAhsDBQsJ
-CAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJECofoFU6E8NKTXIIAIxCNFSm2YvD7+ZY
-v4R3N03GW9cY4J+CrsrG4R1l8B5cIJdGhTPl7Tc2KFi5VVQhImQlMOgntfNa4V+z
-1qTMO0BYrTVMiAHt69faTwYfqZhvh2+81mWZP0Sx7rHIqoLJNNUrGbUSeZE1dWFm
-cmhEOWlTTENEjTmJy/y+DH8BFLAVAot7QXpjVY6adjCqolLLBE6MjuJhIsJl0leP
-z1nZMg/eFR7Ip2hmFHKoc48Wu+ikp1xZxb249zb4OZy0l1E9kU7Pfafki5Xic/1j
-lcBHlJ0bhmJ9Er1WaZfLR+qu6g9qIKNzjk6CjbflQrdDMGKVsVFLvnmO6+LQLfBu
-wtVGosW5AQ0EVImjpAEIAM1tTsUQtUXHuwChMXe1yOHiIq1kJe/ZKA1ymm4FOic7
-x+zE9Dy0fvJUmqI7almBoJ+WSksd95KfJkV+JcVE7aBI5cByUvDERJ3JpktzdSHa
-mT5gNpxaSTtOtZh7Jgi0++P5qIvdiNI9NHor01/jXxDb4K+yRaUwM2Td/rZu+HJo
-A8d8MZbqFb3M18ElejCt1RhfrK0M4wvBQLGbO4gDpCCauDoUZsWOuPNtd+XIuJJ7
-/mTUX67gJUhs2NZTHzbBBHu2JIbxaPE+QEYPQ9E9LKCeZLh1bA7LoIEUMvWU/fOJ
-BuWs5Qe73eHZZjgC4acLGYDD7ZRenDWyGXJXIKGFRTsAEQEAAYkBHwQYAQoACQUC
-VImjpAIbDAAKCRAqH6BVOhPDSuHHB/9UOFhfFq5hyXJO/kV+ua7DQ8dJ2ztyr6xV
-KUjCMV+exieiqOXGpui6rvSW/Iwh6Q3oeMJXMFVIP3T+WHC9Up3eqgZi+qcABr3G
-R7evSDNyAc92JuxKZg7Yko29Pb8SysF/Trz5nhq6hFn4VWV3X0VP1+dIhpfgLGMR
-ic4FqpULut3SYgd4KkoVDWrxe+rqzZbcS0rep8U4GuPSkzKlvu4DxC814xskOrNQ
-tsPPrnrfE+HZ5WQRUZm90JbrcroZX3EEyMxwUmVd1GltN4wwFYhrtDW0bJboHr01
-YuNTvU+U4mz7gZdo9eHhF22xnQDaszS1w/rCYMjJawip5d7+2/SN
-=XO2M
------END PGP PUBLIC KEY BLOCK-----
deleted file mode 100644
--- a/modules/releaserunner2/manifests/init.pp
+++ /dev/null
@@ -1,103 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-class releaserunner2 {
- include ::config
- include dirs::builds
- include users::builder
- include releaserunner2::settings
- include releaserunner2::services
- include packages::mozilla::python27
- include packages::gcc
- include packages::libffi
- include packages::make
- include packages::mysql_devel
-
- $env_config = $config::releaserunner2_env_config[$releaserunner2_env]
-
- python::virtualenv {
- $releaserunner2::settings::root:
- python => $packages::mozilla::python27::python,
- require => [
- Class['packages::mozilla::python27'],
- Class['packages::libffi'],
- ],
- user => $users::builder::username,
- group => $users::builder::group,
- packages => [
- 'Fabric==1.5.1',
- 'Jinja2==2.6',
- 'PGPy==0.3.0',
- 'PyHawk-with-a-single-extra-commit==0.1.5',
- 'PyYAML==3.10',
- 'SQLAlchemy==0.8.0b2',
- 'Tempita==0.5.1',
- 'Twisted==12.3.0',
- 'arrow==0.5.4',
- 'buildbot==0.8.7p1',
- 'certifi==0.0.8',
- 'cffi==0.8.6',
- 'chunkify==1.2',
- 'cryptography==0.6',
- 'decorator==3.4.0',
- 'ecdsa==0.10',
- 'enum34==1.0.4',
- 'futures==3.1.1',
- 'httplib2==0.7.4',
- 'mohawk==0.3.1',
- 'oauth2==1.5.211',
- 'paramiko==1.9.0',
- 'pycparser==2.17',
- 'pycrypto==2.6.1',
- 'python-dateutil==1.5',
- 'python-jose==0.5.2',
- 'redo==1.5',
- 'releasetasks==0.3.3',
- 'requests==2.6.0',
- 'requests-hawk==1.0.0',
- 'simplejson==2.6.2',
- 'singledispatch==3.4.0.3',
- 'six==1.9.0',
- 'slugid==1.0.7',
- 'sqlalchemy-migrate==0.7.2',
- 'taskcluster==0.0.24',
- 'treeherder-client==2.0.1',
- 'toposort==1.5',
- 'wsgiref==0.1.2',
- 'zope.interface==4.0.2',
- ];
- }
-
- file {
- "${releaserunner2::settings::root}/release-runner.yml":
- require => Python::Virtualenv[$releaserunner2::settings::root],
- mode => '0600',
- owner => $users::builder::username,
- group => $users::builder::group,
- content => template('releaserunner2/release-runner.yml.erb'),
- show_diff => false;
- "${releaserunner2::settings::root}/docker-worker-pub.pem":
- require => Python::Virtualenv[$releaserunner2::settings::root],
- owner => $users::builder::username,
- group => $users::builder::group,
- source => "puppet:///modules/${module_name}/docker-worker-pub.pem";
- # XXX: Todo name funsize_signing_pvt_key better for current use-case
- "${releaserunner2::settings::root}/id_rsa":
- require => Python::Virtualenv[$releaserunner2::settings::root],
- mode => '0600',
- owner => $users::builder::username,
- group => $users::builder::group,
- content => secret('funsize_signing_pvt_key'),
- show_diff => false;
- }
-
- mercurial::repo {
- 'releaserunner2-tools':
- require => Python::Virtualenv[$releaserunner2::settings::root],
- hg_repo => $config::releaserunner_tools,
- dst_dir => $releaserunner2::settings::tools_dst,
- user => $users::builder::username,
- branch => $config::releaserunner_tools_branch,
- }
-}
deleted file mode 100644
--- a/modules/releaserunner2/manifests/services.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-class releaserunner2::services {
- include ::config
- include packages::mozilla::supervisor
- include releaserunner2::settings
-
- supervisord::supervise {
- 'releaserunner2':
- command => "${releaserunner2::settings::tools_dst}/buildfarm/release/release-runner2.sh ${releaserunner2::settings::root} ${releaserunner2::settings::logfile} ${releaserunner2::settings::root}/${config::releaserunner2_env_config[$releaserunner2_env]['releaserunner_config_file']}",
- user => $::config::builder_username,
- require => [ File["${releaserunner2::settings::root}/${config::releaserunner2_env_config[$releaserunner2_env]['releaserunner_config_file']}"],
- Python::Virtualenv[$releaserunner2::settings::root],
- Mercurial::Repo['releaserunner2-tools']],
- extra_config => template("${module_name}/extra_config.erb")
- }
-}
deleted file mode 100644
--- a/modules/releaserunner2/manifests/settings.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-class releaserunner2::settings {
- include ::config
-
- $root = $config::releaserunner2_root
- $tools_dst = "${root}/tools"
- $logfile = "${root}/release-runner2.log"
-}
deleted file mode 100644
--- a/modules/releaserunner2/templates/extra_config.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-exitcodes=0
-log_stderr=true
-log_stdout=true
-redirect_stderr=true
-stdout_logfile=<%= scope.lookupvar('releaserunner2::settings::logfile') %>
-autorestart=true
-logfile_maxbytes=50MB
-logfile_backups=10
-stopasgroup=true
-killasgroup=true
deleted file mode 100644
--- a/modules/releaserunner2/templates/release-runner.yml.erb
+++ /dev/null
@@ -1,59 +0,0 @@
-api:
- api_root: <%= @env_config["ship_it_root"] %>
- username: <%= @env_config["ship_it_username"] %>
- password: <%= @env_config["ship_it_password"] %>
-
-release-runner:
- notify_from: <%= scope.lookupvar('config::releaserunner_notify_from') %>
- notify_to: <%= @env_config["notify_to"] %>
- notify_to_announce: <%= @env_config["notify_to_announce"] %>
- smtp_server: <%= scope.lookupvar('config::releaserunner_smtp_server') %>
- hg_host: <%= scope.lookupvar('config::releaserunner_hg_host') %>
- hg_username: <%= scope.lookupvar('config::releaserunner_hg_username') %>
- hg_ssh_key: <%= scope.lookupvar('config::releaserunner_hg_ssh_key') %>
- buildbot_configs: <%= @env_config["releaserunner_buildbot_configs"] %>
- buildbot_configs_branch: <%= @env_config["releaserunner_buildbot_configs_branch"] %>
- buildbotcustom: <%= scope.lookupvar('config::releaserunner_buildbotcustom') %>
- buildbotcustom_branch: <%= scope.lookupvar('config::releaserunner_buildbotcustom_branch') %>
- tools: <%= scope.lookupvar('config::releaserunner_tools') %>
- tools_branch: <%= scope.lookupvar('config::releaserunner_tools_branch') %>
- masters_json: <%= scope.lookupvar('config::releaserunner_production_masters') %>
- sendchange_master: <%= scope.lookupvar('config::releaserunner_sendchange_master') %>
- staging: false
- verbose: true
- sleeptime: 30
- ssh_username: <%= scope.lookupvar('config::releaserunner_ssh_username') %>
- ssh_key: <%= scope.lookupvar('users::builder::home') %>/.ssh/release-runner
- docker_worker_key: <%= scope.lookupvar('releaserunner2::settings::root') %>/docker-worker-pub.pem
- release_runner_config: <%= scope.lookupvar('releaserunner2::settings::root') %>/release-runner.yml
- relconfigs_root: <%= scope.lookupvar('users::builder::home') %>/releasetasks/releasetasks/release_configs
- relconfigs_prefix: <%= @env_config["releasetasks_relconfigs_prefix"] %>
-
-taskcluster:
- client_id: <%= @env_config["taskcluster_client_id"] %>
- access_token: <%= @env_config["taskcluster_access_token"] %>
-
-symlinks:
- production_config.py: "{buildbot_configs}/mozilla/localconfig.py"
- thunderbird_production_config.py: "{buildbot_configs}/mozilla/thunderbird_localconfig.py"
-
-balrog:
- username: <%= @env_config["balrog_username"] %>
- password: <%= @env_config["balrog_password"] %>
-
-beetmover:
- aws_access_key_id: <%= @env_config["beetmover_aws_access_key_id"] %>
- aws_secret_access_key: <%= @env_config["beetmover_aws_secret_access_key"] %>
-
-signing:
- pvt_key: <%= scope.lookupvar("config::releaserunner2_root") %>/id_rsa
- gpg_key_path: <%= scope.lookupvar('releaserunner2::settings::tools_dst') %>/<%= @env_config["releaserunner_gpg_key_path"] %>
-
-
-releases:
- - product: fennec
- pattern: <%= @env_config["fennec_pattern"] %>
- checks:
- - long_revision
- - check_allowed_branches
- allowed_branches: <%= require "json"; JSON.generate(Array(@env_config["allowed_branches"])) %>
deleted file mode 100644
--- a/modules/toplevel/manifests/mixin/releaserunner2.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-class toplevel::mixin::releaserunner2 {
- include ::releaserunner2
-}