[MediaWiki-commits] [Gerrit] role::ci::slave::labs - change (operations/puppet)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/96483 Change subject: role::ci::slave::labs .. role::ci::slave::labs A specific Jenkins CI slave that run on slave. Comes with some packages which are not suitable for production as defined in the new class contint::packages::labs (installs npm/python-pip for now). Possible issue to look at is how puppet handle sub directories. I used the layout: Change-Id: Ie294906834cdb86ac07b9d9b791153a1c61e05f7 contint::packagesmodules/contint/manifests/package.pp contint::packages::labs modules/contint/manifests/package/labs.pp --- M manifests/role/ci.pp A modules/contint/manifests/packages/labs.pp 2 files changed, 32 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/83/96483/1 diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp index 9754b0b..7c066ab 100644 --- a/manifests/role/ci.pp +++ b/manifests/role/ci.pp @@ -205,6 +205,21 @@ } +class role::ci::slave::labs { + + system::role { 'role::ci::slave::labs': +description = 'CI Jenkins slave on labs' } + + if $::realm != 'labs' { +fail(role::ci::slave::labs must only be applied in labs) + } + + include role::ci::slave::labs::common, +# Include package unsafe for production +contint::packages::labs + +} + # The testswarm installation # Although not used as of July 2013, we will resurect this one day. class role::ci::testswarm { diff --git a/modules/contint/manifests/packages/labs.pp b/modules/contint/manifests/packages/labs.pp new file mode 100644 index 000..3fb5236 --- /dev/null +++ b/modules/contint/manifests/packages/labs.pp @@ -0,0 +1,17 @@ +# Packages that should only be on labs +# +class contint::packages::labs { + +if $::realm == 'production' { +fail( 'contint::packages::labs must not be used in production' ) +} + +include contint::packages + +package { [ +'npm', +'python-pip', +]: ensure = present, +} + +} -- To view, visit https://gerrit.wikimedia.org/r/96483 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie294906834cdb86ac07b9d9b791153a1c61e05f7 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
[MediaWiki-commits] [Gerrit] role::ci::slave::labs - change (operations/puppet)
ArielGlenn has submitted this change and it was merged. Change subject: role::ci::slave::labs .. role::ci::slave::labs A specific Jenkins CI slave that run on slave. Comes with some packages which are not suitable for production as defined in the new class contint::packages::labs (installs npm/python-pip for now). Possible issue to look at is how puppet handle sub directories. I used the layout: Change-Id: Ie294906834cdb86ac07b9d9b791153a1c61e05f7 contint::packagesmodules/contint/manifests/package.pp contint::packages::labs modules/contint/manifests/package/labs.pp --- M manifests/role/ci.pp A modules/contint/manifests/packages/labs.pp 2 files changed, 32 insertions(+), 0 deletions(-) Approvals: ArielGlenn: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp index 9754b0b..7c066ab 100644 --- a/manifests/role/ci.pp +++ b/manifests/role/ci.pp @@ -205,6 +205,21 @@ } +class role::ci::slave::labs { + + system::role { 'role::ci::slave::labs': +description = 'CI Jenkins slave on labs' } + + if $::realm != 'labs' { +fail(role::ci::slave::labs must only be applied in labs) + } + + include role::ci::slave::labs::common, +# Include package unsafe for production +contint::packages::labs + +} + # The testswarm installation # Although not used as of July 2013, we will resurect this one day. class role::ci::testswarm { diff --git a/modules/contint/manifests/packages/labs.pp b/modules/contint/manifests/packages/labs.pp new file mode 100644 index 000..3fb5236 --- /dev/null +++ b/modules/contint/manifests/packages/labs.pp @@ -0,0 +1,17 @@ +# Packages that should only be on labs +# +class contint::packages::labs { + +if $::realm == 'production' { +fail( 'contint::packages::labs must not be used in production' ) +} + +include contint::packages + +package { [ +'npm', +'python-pip', +]: ensure = present, +} + +} -- To view, visit https://gerrit.wikimedia.org/r/96483 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie294906834cdb86ac07b9d9b791153a1c61e05f7 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits