Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/315475
Change subject: (WIP) Zuul hiera refactoring (WIP) ...................................................................... (WIP) Zuul hiera refactoring (WIP) https://gerrit.wikimedia.org/r/#/c/308778/8 Change-Id: I43d6432df65931deb004b8183cb1726b50210d73 --- A hieradata/common/zuul.yaml M hieradata/hosts/gallium.yaml D hieradata/hosts/scandium.yaml M hieradata/role/common/zuul/merger.yaml A hieradata/role/common/zuul/server.yaml M modules/contint/manifests/website.pp M modules/role/manifests/ci/slave.pp M modules/role/manifests/ci/slave/browsertests.pp M modules/role/manifests/ci/slave/labs.pp M modules/role/manifests/ci/slave/localbrowser.pp M modules/role/manifests/ci/website.pp D modules/role/manifests/zuul/install.pp M modules/role/manifests/zuul/merger.pp M modules/role/manifests/zuul/server.pp 14 files changed, 34 insertions(+), 52 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/75/315475/1 diff --git a/hieradata/common/zuul.yaml b/hieradata/common/zuul.yaml new file mode 100644 index 0000000..4a31991 --- /dev/null +++ b/hieradata/common/zuul.yaml @@ -0,0 +1,5 @@ +zuul::common: + gerrit_server: gerrit.wikimedia.org + gerrit_user: jenkins-bot + url_pattern: 'https://integration.wikimedia.org/ci/job/{job.name}/{build.number}/console' + status_url: 'https://integration.wikimedia.org/zuul/' diff --git a/hieradata/hosts/gallium.yaml b/hieradata/hosts/gallium.yaml index 3280203..b3b343b 100644 --- a/hieradata/hosts/gallium.yaml +++ b/hieradata/hosts/gallium.yaml @@ -6,19 +6,3 @@ ssh::server::explicit_macs: false cluster: misc contactgroups: 'admins,contint' - -zuul::common: - gerrit_server: gerrit.wikimedia.org - gerrit_user: jenkins-bot - url_pattern: 'https://integration.wikimedia.org/ci/job/{job.name}/{build.number}/console' - status_url: 'https://integration.wikimedia.org/zuul/' - -zuul::server: - # ferm defaults to ACCEPT on loopback: - gearman_server: 127.0.0.1 - config_git_branch: master - gearman_server_start: true - jenkins_server: http://127.0.0.1:8080/ci - jenkins_user: zuul-bot - # FIXME use a lookup? - statsd_host: statsd.eqiad.wmnet diff --git a/hieradata/hosts/scandium.yaml b/hieradata/hosts/scandium.yaml deleted file mode 100644 index 3e3c16e..0000000 --- a/hieradata/hosts/scandium.yaml +++ /dev/null @@ -1,19 +0,0 @@ -admin::groups: - - contint-users - - contint-admins -cluster: misc -contactgroups: 'admins,contint' - -zuul::common: - gerrit_server: gerrit.wikimedia.org - gerrit_user: jenkins-bot - url_pattern: 'https://integration.wikimedia.org/ci/job/{job.name}/{build.number}/console' - status_url: 'https://integration.wikimedia.org/zuul/' - -zuul::merger: - gearman_server: '208.80.154.135' # gallium.wikimedia.org - gerrit_ssh_key_file: 'ssh/ci/jenkins-bot_gerrit_id_rsa' - git_dir: '/srv/ssd/zuul/git' - git_email: "zuul-merger@%{::hostname}" - git_name: 'Wikimedia Zuul Merger' - zuul_url: "git://%{::fqdn}" diff --git a/hieradata/role/common/zuul/merger.yaml b/hieradata/role/common/zuul/merger.yaml index 466786b..e9195ce 100644 --- a/hieradata/role/common/zuul/merger.yaml +++ b/hieradata/role/common/zuul/merger.yaml @@ -1,3 +1,17 @@ debdeploy::grains: debdeploy-zuulmerger: value: standard + +admin::groups: + - contint-users + - contint-admins +cluster: misc +contactgroups: 'admins,contint' + +zuul::merger: + gearman_server: '208.80.154.135' # gallium.wikimedia.org + gerrit_ssh_key_file: 'ssh/ci/jenkins-bot_gerrit_id_rsa' + git_dir: '/srv/ssd/zuul/git' + git_email: "zuul-merger@%{::hostname}" + git_name: 'Wikimedia Zuul Merger' + zuul_url: "git://%{::fqdn}" diff --git a/hieradata/role/common/zuul/server.yaml b/hieradata/role/common/zuul/server.yaml new file mode 100644 index 0000000..51128dd --- /dev/null +++ b/hieradata/role/common/zuul/server.yaml @@ -0,0 +1,9 @@ +zuul::server: + # ferm defaults to ACCEPT on loopback: + gearman_server: 127.0.0.1 + config_git_branch: master + gearman_server_start: true + jenkins_server: http://127.0.0.1:8080/ci + jenkins_user: zuul-bot + # FIXME use a lookup? + statsd_host: statsd.eqiad.wmnet diff --git a/modules/contint/manifests/website.pp b/modules/contint/manifests/website.pp index f8093dd..07bcc15 100644 --- a/modules/contint/manifests/website.pp +++ b/modules/contint/manifests/website.pp @@ -1,7 +1,7 @@ # Class for website hosted on the continuous integration server # https://integration.mediawiki.org/ # https://doc.wikimedia.org/ -class contint::website( ){ +class contint::website(){ # Need to send Vary: X-Forwarded-Proto since most sites are forced to HTTPS # and behind a varnish cache. See also T62822 diff --git a/modules/role/manifests/ci/slave.pp b/modules/role/manifests/ci/slave.pp index 3d95a62..a72a0ae 100644 --- a/modules/role/manifests/ci/slave.pp +++ b/modules/role/manifests/ci/slave.pp @@ -11,7 +11,7 @@ system::role { 'role::ci::slave': description => 'CI slave runner' } include contint::packages - include role::zuul::install + include ::zuul require contint::master_dir diff --git a/modules/role/manifests/ci/slave/browsertests.pp b/modules/role/manifests/ci/slave/browsertests.pp index d70191d..2a79b79 100644 --- a/modules/role/manifests/ci/slave/browsertests.pp +++ b/modules/role/manifests/ci/slave/browsertests.pp @@ -6,7 +6,7 @@ } include role::ci::slave::labs::common - include role::zuul::install + include ::zuul include contint::browsertests # For CirrusSearch testing: diff --git a/modules/role/manifests/ci/slave/labs.pp b/modules/role/manifests/ci/slave/labs.pp index 729b35d..17387be 100644 --- a/modules/role/manifests/ci/slave/labs.pp +++ b/modules/role/manifests/ci/slave/labs.pp @@ -38,7 +38,7 @@ include contint::php include role::ci::slave::labs::common - include role::zuul::install + include ::zuul if os_version('ubuntu >= trusty || debian >= jessie') { include role::ci::slave::localbrowser diff --git a/modules/role/manifests/ci/slave/localbrowser.pp b/modules/role/manifests/ci/slave/localbrowser.pp index 6a51dae..e0746d1 100644 --- a/modules/role/manifests/ci/slave/localbrowser.pp +++ b/modules/role/manifests/ci/slave/localbrowser.pp @@ -6,7 +6,7 @@ } include role::ci::slave::labs::common - include role::zuul::install + include ::zuul include contint::browsers } diff --git a/modules/role/manifests/ci/website.pp b/modules/role/manifests/ci/website.pp index f7cef1b..58b7720 100644 --- a/modules/role/manifests/ci/website.pp +++ b/modules/role/manifests/ci/website.pp @@ -11,5 +11,5 @@ # Needed at least for the jenkins-slave user require ::role::ci::slave - include contint::website + class { 'contint::website': } } diff --git a/modules/role/manifests/zuul/install.pp b/modules/role/manifests/zuul/install.pp deleted file mode 100644 index d0dd3ac..0000000 --- a/modules/role/manifests/zuul/install.pp +++ /dev/null @@ -1,9 +0,0 @@ -# == Class role::zuul::install -# -# Wrapper around ::zuul class which is needed by both merger and server roles -# that can in turn be installed on the same node. Prevent a duplication error. -# -class role::zuul::install { - - class { '::zuul': } -} diff --git a/modules/role/manifests/zuul/merger.pp b/modules/role/manifests/zuul/merger.pp index 7ad6e5f..6c38ac9 100644 --- a/modules/role/manifests/zuul/merger.pp +++ b/modules/role/manifests/zuul/merger.pp @@ -1,7 +1,6 @@ class role::zuul::merger { system::role { 'role::zuul::merger': description => 'Zuul merger' } - include role::zuul::install include ::zuul::monitoring::merger $conf_common = hiera_hash('zuul::common') diff --git a/modules/role/manifests/zuul/server.pp b/modules/role/manifests/zuul/server.pp index d2fb07e..c3075c5 100644 --- a/modules/role/manifests/zuul/server.pp +++ b/modules/role/manifests/zuul/server.pp @@ -2,7 +2,6 @@ system::role { 'role::zuul::server': description => 'Zuul server (scheduler)' } include contint::proxy_zuul - include ::role::zuul::install include ::zuul::monitoring::server # Zuul server needs an API key to interact with Jenkins: -- To view, visit https://gerrit.wikimedia.org/r/315475 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I43d6432df65931deb004b8183cb1726b50210d73 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar <has...@free.fr> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
