Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/379187 )
Change subject: contint: deploy slave_scripts via git::clone
......................................................................
contint: deploy slave_scripts via git::clone
integration/jenkins.git contains scripts for the CI job. It is
provisioned via contint::slave_scripts.
On production machines, that used to be deployed via
git-deploy/Trebuchet hence the class was not applied on those hosts.
Trebuchet NEVER WORKED though, so I had to manually git pull the
repository from time to time.
Allow contint::slave_scripts (and thus git::clone) to be included on
production machines.
Add the class to the role::ci::slave which is used for the production
hosts.
Impact:
- hosts:
contint1001.wikimedia.org
contint2001.wikimedia.org
- puppet would then: git::clone ensure=>latest
Change-Id: Iab7ae93f6c5b23592aea8ef6935b74776611e179
---
M modules/contint/manifests/slave_scripts.pp
M modules/role/manifests/ci/slave.pp
2 files changed, 1 insertion(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/87/379187/1
diff --git a/modules/contint/manifests/slave_scripts.pp
b/modules/contint/manifests/slave_scripts.pp
index fe9608b..a2bc8ab 100644
--- a/modules/contint/manifests/slave_scripts.pp
+++ b/modules/contint/manifests/slave_scripts.pp
@@ -4,10 +4,6 @@
#
class contint::slave_scripts {
- if $::realm == 'production' {
- fail('contint::slave_scripts must not be used in production. Slaves
are already Trebuchet deployment targets.')
- }
-
require ::contint::deployment_dir
git::clone { 'jenkins CI slave scripts':
diff --git a/modules/role/manifests/ci/slave.pp
b/modules/role/manifests/ci/slave.pp
index d1d2609..dffc21f 100644
--- a/modules/role/manifests/ci/slave.pp
+++ b/modules/role/manifests/ci/slave.pp
@@ -11,6 +11,7 @@
system::role { 'ci::slave': description => 'CI slave runner' }
include contint::packages::base
+ include contint::packages::slave_scripts
include ::zuul
class { 'jenkins::slave':
--
To view, visit https://gerrit.wikimedia.org/r/379187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab7ae93f6c5b23592aea8ef6935b74776611e179
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
