Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317988
Change subject: contint: drop contint::packages
......................................................................
contint: drop contint::packages
The class was meant to share packages definition between production
and labs slaves. Nowadays almost everything runs on labs and
contint::packages has been slowly deprecated in favor of
contint::packages::labs.
The last remnant is contint::packages::base which just installs
curl/colordiff.
Directly include contint::packages::base instead of contint::packages
Remove the include from contint::browsertests, it is always included on
slaves that already include contint::packages::base.
Delete the now useless manifest.
Change-Id: I9b39096c565741b51059acc24a027457f0358d91
---
M modules/contint/manifests/browsertests.pp
D modules/contint/manifests/packages.pp
M modules/contint/manifests/packages/labs.pp
M modules/role/manifests/ci/slave.pp
4 files changed, 2 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/88/317988/1
diff --git a/modules/contint/manifests/browsertests.pp
b/modules/contint/manifests/browsertests.pp
index 79f30ea..51eae39 100644
--- a/modules/contint/manifests/browsertests.pp
+++ b/modules/contint/manifests/browsertests.pp
@@ -2,8 +2,6 @@
#
class contint::browsertests {
- # Ship several packages such as php5-sqlite or ruby1.9.3
- include contint::packages
include contint::packages::ruby
# Provides phantomjs, firefox and xvfb
diff --git a/modules/contint/manifests/packages.pp
b/modules/contint/manifests/packages.pp
deleted file mode 100644
index f69c8fc..0000000
--- a/modules/contint/manifests/packages.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Holds all the packages needed for continuous integration.
-#
-# FIXME: split this!
-#
-class contint::packages {
-
- # Basic utilites needed for all Jenkins slaves
- include ::contint::packages::base
-
-}
diff --git a/modules/contint/manifests/packages/labs.pp
b/modules/contint/manifests/packages/labs.pp
index e146f1c..080ffb0 100644
--- a/modules/contint/manifests/packages/labs.pp
+++ b/modules/contint/manifests/packages/labs.pp
@@ -7,7 +7,7 @@
require contint::packages::apt
- include contint::packages
+ include contint::packages::base
include ::mediawiki::packages
include ::mediawiki::packages::multimedia # T76661
diff --git a/modules/role/manifests/ci/slave.pp
b/modules/role/manifests/ci/slave.pp
index a04403c..9cd1134 100644
--- a/modules/role/manifests/ci/slave.pp
+++ b/modules/role/manifests/ci/slave.pp
@@ -10,7 +10,7 @@
system::role { 'role::ci::slave': description => 'CI slave runner' }
- include contint::packages
+ include contint::packages::base
require contint::master_dir
class { '::zuul': }
--
To view, visit https://gerrit.wikimedia.org/r/317988
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b39096c565741b51059acc24a027457f0358d91
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
