jenkins-bot has submitted this change and it was merged. Change subject: dib: fix contint::localhost-worker and only on Jessie ......................................................................
dib: fix contint::localhost-worker and only on Jessie It must belong to jenkins user since 'jenkins' is provided by devuser/install.d/50, bump our steps: puppet 05 -> 51 git-mirror 51 -> 52 Augeas['Apache2 logs'] interacts with /etc/logrotate.d/apache2 which is provided by Package['apache2']. Add an ordering statement to have the package realized first. Sent to puppet.git https://gerrit.wikimedia.org/r/#/c/291024/ Only provisionned on Jessie which has NodeJs 4.3 for Karma. Bug: T136301 Change-Id: I075a39f347d234d3c71ae0e3226b1815dc4e0d31 Depends-On: I8f62962c515019bb87fa92937c8c5435e6d53359 --- R dib/elements/wikimedia/install.d/51-puppet R dib/elements/wikimedia/install.d/52-git-mirror-ownership M dib/puppet/ciimage.pp 3 files changed, 39 insertions(+), 4 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/dib/elements/wikimedia/install.d/05-puppet b/dib/elements/wikimedia/install.d/51-puppet similarity index 95% rename from dib/elements/wikimedia/install.d/05-puppet rename to dib/elements/wikimedia/install.d/51-puppet index f786531..0f663bb 100755 --- a/dib/elements/wikimedia/install.d/05-puppet +++ b/dib/elements/wikimedia/install.d/51-puppet @@ -7,6 +7,8 @@ set -eu set -o pipefail +# 'jenkins' user is added by devuser/install.d/50-devuser + DIB_WIKIMEDIA_PUPPET_DEST=${DIB_WIKIMEDIA_PUPPET_DEST:-/puppet} mkdir -v -p $(dirname $DIB_WIKIMEDIA_PUPPET_DEST) diff --git a/dib/elements/wikimedia/install.d/51-git-mirror-ownership b/dib/elements/wikimedia/install.d/52-git-mirror-ownership similarity index 100% rename from dib/elements/wikimedia/install.d/51-git-mirror-ownership rename to dib/elements/wikimedia/install.d/52-git-mirror-ownership diff --git a/dib/puppet/ciimage.pp b/dib/puppet/ciimage.pp index 17e3da3..25dc0a5 100644 --- a/dib/puppet/ciimage.pp +++ b/dib/puppet/ciimage.pp @@ -40,10 +40,6 @@ refreshonly => true, } -# Qunit/Selenium related -include contint::browsers -include contint::worker_localhost - require_package('libimage-exiftool-perl') # MediaWiki has $wgDjvuPostProcessor = 'pnmtojpeg'; # Provided by netpbm which is in imagemagick Recommends @@ -74,10 +70,47 @@ } } +class apache2_allow_execution { + exec { 'allow apache2 execution': + command => '/bin/chmod +x /usr/sbin/apache2', + } +} if os_version('debian >= jessie') { include contint::packages::python + + # Qunit/Selenium related include contint::browsers + class { 'contint::worker_localhost': + owner => 'jenkins', + } + + # Augeas rule deals with /etc/logrotate.d/apache2 + # Sent to puppet.git https://gerrit.wikimedia.org/r/#/c/291024/ + Package['apache2'] ~> Augeas['Apache2 logs'] + + # Nasty workaround when running inside a chroot... + exec { 'prevent apache2 from executing': + refreshonly => true, + command => '/bin/chmod -x /usr/sbin/apache2', + onlyif => '/bin/bash -c "export | grep DIB_"', + subscribe => Package['apache2'], + before => [ + Service['apache2'], + Exec['apache2_hard_restart'], + ], + require => [ + Exec['apache2_test_config_and_restart'], + ], + } + + stage { 'last': } + Stage['main'] -> Stage['last'] + + class { 'apache2_allow_execution': + stage => last, + } + # services packages and -dev packages for npm modules compilation and test # run. NOTE: hiera must have: service::configuration::use_dev_pkgs: true include graphoid::packages -- To view, visit https://gerrit.wikimedia.org/r/290939 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I075a39f347d234d3c71ae0e3226b1815dc4e0d31 Gerrit-PatchSet: 12 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar <[email protected]> Gerrit-Reviewer: Hashar <[email protected]> Gerrit-Reviewer: Paladox <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
