Bug 1422872 - Remove funsize_scheduler module r=sfraser
MozReview-Commit-ID: Fz1tX0j8KoC
--- a/manifests/moco-config.pp
+++ b/manifests/moco-config.pp
@@ -664,27 +664,16 @@ class config inherits config::base {
$signingworker_exchange = 'exchange/taskcluster-queue/v1/task-pending'
$signingworker_worker_type = 'signing-worker-v1'
# scriptworker
$scriptworker_root = '/builds/scriptworker' # Used by scriptworker instances
$scriptworker_gpg_private_keys = hiera_hash('scriptworker_gpg_private_keys')
$scriptworker_gpg_public_keys = hiera_hash('scriptworker_gpg_public_keys')
- # Funsize Scheduler configuration
- $funsize_scheduler_root = '/builds/funsize'
- $funsize_scheduler_balrog_username = 'balrog-funsize'
- $funsize_scheduler_pulse_username = 'funsize'
- $funsize_scheduler_pulse_queue = 'scheduler'
- $funsize_scheduler_bb_pulse_exchange = 'exchange/build'
- $funsize_scheduler_tc_pulse_exchange = 'exchange/taskcluster-queue/v1/task-completed'
- $funsize_scheduler_s3_bucket = 'mozilla-nightly-updates'
- $funsize_scheduler_balrog_worker_api_root = 'http://balrog/api'
- $funsize_scheduler_th_api_root = 'https://treeherder.mozilla.org/api'
-
$l10n_bumper_env_config = {
'mozilla-central' => {
mozharness_repo => 'https://hg.mozilla.org/mozilla-central',
mozharness_revision => 'dedd9a48da69',
config_file => 'l10n_bumper/mozilla-central.py',
},
'mozilla-beta' => {
mozharness_repo => 'https://hg.mozilla.org/mozilla-central',
--- a/manifests/moco-nodes.pp
+++ b/manifests/moco-nodes.pp
@@ -756,44 +756,41 @@ node 'buildbot-master91.bb.releng.usw2.m
$only_user_ssh = true
buildmaster::buildbot_master::mozilla {
'bm91-build1':
http_port => 8001,
master_type => 'build',
basedir => 'build1';
}
include toplevel::server::buildmaster::mozilla
- include toplevel::mixin::funsize_scheduler
}
node 'buildbot-master94.bb.releng.use1.mozilla.com' {
$aspects = [ 'high-security' ]
$only_user_ssh = true
buildmaster::buildbot_master::mozilla {
'bm94-build1':
http_port => 8001,
master_type => 'build',
basedir => 'build1';
}
include toplevel::server::buildmaster::mozilla
- include toplevel::mixin::funsize_scheduler
}
node 'buildbot-master103.bb.releng.scl3.mozilla.com' {
$aspects = [ 'high-security' ]
$only_user_ssh = true
buildmaster::buildbot_master::mozilla {
'bm103-tests1-linux':
http_port => 8201,
master_type => 'tests',
basedir => 'tests1-linux';
}
include fw::profiles::buildbot_master
include toplevel::server::buildmaster::mozilla
- include toplevel::mixin::funsize_scheduler
}
node 'buildbot-master104.bb.releng.scl3.mozilla.com' {
$aspects = [ 'high-security' ]
$only_user_ssh = true
buildmaster::buildbot_master::mozilla {
'bm104-tests1-linux':
http_port => 8201,
--- a/modules/config/manifests/base.pp
+++ b/modules/config/manifests/base.pp
@@ -498,19 +498,9 @@ class config::base {
$signingworker_tools_branch = 'default'
$signingworker_root = '/builds/signingworker'
$signingworker_pulse_host = 'pulse.mozilla.org'
$signingworker_pulse_port = 5671
$signingworker_verbose_logging = 'true'
$signingworker_exchange = ''
$signingworker_worker_type = ''
$signingworker_balrog_api_root = 'https://aus4-admin.mozilla.org/api'
-
- # Funsize Scheduler configuration
- $funsize_scheduler_root = '/builds/funsize'
- $funsize_scheduler_balrog_username = ''
- $funsize_scheduler_pulse_username = ''
- $funsize_scheduler_pulse_queue = ''
- $funsize_scheduler_pulse_exchange = ''
- $funsize_scheduler_s3_bucket = ''
- $funsize_scheduler_balrog_worker_api_root = ''
- $funsize_scheduler_th_api_root = ''
}
deleted file mode 100644
--- a/modules/funsize_scheduler/manifests/conf.pp
+++ /dev/null
@@ -1,27 +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 funsize_scheduler::conf {
- include ::config
- include funsize_scheduler::settings
- include dirs::builds
- include users::builder
-
- file {
- "${funsize_scheduler::settings::root}/config.yml":
- require => Python::Virtualenv[$funsize_scheduler::settings::root],
- mode => '0600',
- owner => $users::builder::username,
- group => $users::builder::group,
- content => template("${module_name}/config.yml.erb"),
- show_diff => false;
- "${funsize_scheduler::settings::root}/id_rsa":
- require => Python::Virtualenv[$funsize_scheduler::settings::root],
- mode => '0600',
- owner => $users::builder::username,
- group => $users::builder::group,
- content => secret('funsize_signing_pvt_key'),
- show_diff => false;
- }
-}
deleted file mode 100644
--- a/modules/funsize_scheduler/manifests/init.pp
+++ /dev/null
@@ -1,63 +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 funsize_scheduler {
- include ::config
- include funsize_scheduler::settings
- include dirs::builds
- include packages::gcc
- include packages::libffi
- include packages::make
- include packages::mozilla::python27
- include users::builder
-
- python::virtualenv {
- $funsize_scheduler::settings::root:
- python => $packages::mozilla::python27::python,
- require => [
- Class['packages::mozilla::python27'],
- Class['packages::libffi'],
- ],
- user => $users::builder::username,
- group => $users::builder::group,
- packages => [
- 'amqp==1.4.6',
- 'anyjson==0.3.3',
- 'argparse==1.4.0',
- 'cffi==1.9.1',
- 'cryptography==1.7.1',
- 'ecdsa==0.10',
- 'enum34==1.0.4',
- 'funsize==0.95',
- 'ndg_httpsclient==0.4.2',
- 'idna==2.2',
- 'importlib==1.0.4',
- 'iniparse==0.3.1',
- 'ipaddress==1.0.18',
- 'Jinja2==2.7.1',
- 'kombu==3.0.26',
- 'MarkupSafe==0.23',
- 'more_itertools==2.2',
- # Actual package is PGPy 0.4.0.post1, but older `pip`s have issues with the name
- 'PGPy==0.4.0',
- 'PyHawk-with-a-single-extra-commit==0.1.5',
- 'pyOpenSSL==16.2.0',
- 'PyYAML==3.10',
- 'pyasn1==0.1.9',
- 'pycparser==2.13',
- 'pycrypto==2.6.1',
- 'python-jose==0.5.6',
- 'redo==1.4.1',
- # Taskcluster pins requests 2.4.3, so we need to de the same,
- # even though we'd rather use a more up-to-date version.
- 'requests[security]==2.4.3',
- 'setuptools==33.1.1',
- 'singledispatch==3.4.0.3',
- 'six==1.10.0',
- 'slugid==1.0.6',
- 'taskcluster>=0.0.26',
- 'wsgiref==0.1.2',
- ];
- }
-}
deleted file mode 100644
--- a/modules/funsize_scheduler/manifests/settings.pp
+++ /dev/null
@@ -1,9 +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 funsize_scheduler::settings {
- include ::config
-
- $root = $config::funsize_scheduler_root
-}
deleted file mode 100644
--- a/modules/funsize_scheduler/templates/config.yml.erb
+++ /dev/null
@@ -1,26 +0,0 @@
----
-balrog:
- username: "<%= scope.lookupvar("config::funsize_scheduler_balrog_username") %>"
- password: "<%= scope.function_secret(["funsize_scheduler_balrog_password2"]) %>"
- api_root: "https://aus4-admin.mozilla.org/api"
- cert: "<%= scope.lookupvar("config::funsize_scheduler_root") %>/lib/python2.7/site-packages/funsize/data/ca-bundle.crt"
- worker_api_root: "<%= scope.lookupvar("config::funsize_scheduler_balrog_worker_api_root") %>"
-
-pulse:
- user: "<%= scope.lookupvar("config::funsize_scheduler_pulse_username") %>"
- password: "<%= scope.function_secret(["funsize_scheduler_pulse_password"]) %>"
- queue: "<%= scope.lookupvar("config::funsize_scheduler_pulse_queue") %>"
- bb_exchange: "<%= scope.lookupvar("config::funsize_scheduler_bb_pulse_exchange") %>"
- tc_exchange: "<%= scope.lookupvar("config::funsize_scheduler_tc_pulse_exchange") %>"
-
-taskcluster:
- credentials:
- clientId: "<%= scope.function_secret(["funsize_scheduler_taskcluster_client_id"]) %>"
- accessToken: "<%= scope.function_secret(["funsize_scheduler_taskcluster_access_token"]) %>"
-s3:
- bucket: "<%= scope.lookupvar("config::funsize_scheduler_s3_bucket") %>"
- aws_access_key_id: "<%= scope.function_secret(["funsize_scheduler_aws_access_key_id"]) %>"
- aws_secret_access_key: "<%= scope.function_secret(["funsize_scheduler_aws_secret_access_key"]) %>"
-th_api_root: "<%= scope.lookupvar("config::funsize_scheduler_th_api_root") %>"
-signing:
- pvt_key: "<%= scope.lookupvar("config::funsize_scheduler_root") %>/id_rsa"
deleted file mode 100644
--- a/modules/funsize_scheduler/templates/funsize_scheduler_supervisor_config.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-log_stderr=true
-log_stdout=true
-redirect_stderr=true
-stdout_logfile=syslog
-autorestart=true
-autostart=true
deleted file mode 100644
--- a/modules/toplevel/manifests/mixin/funsize_scheduler.pp
+++ /dev/null
@@ -1,8 +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::funsize_scheduler {
- include ::funsize_scheduler
-}
-