jenkins-bot has submitted this change and it was merged.
Change subject: dib: attempt to force apt-get update
......................................................................
dib: attempt to force apt-get update
Change-Id: Ib59de69ad0d235193c5d96af35ab56dc259435ee
---
M dib/puppet/ciimage.pp
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/dib/puppet/ciimage.pp b/dib/puppet/ciimage.pp
index be8c419..6aa773f 100644
--- a/dib/puppet/ciimage.pp
+++ b/dib/puppet/ciimage.pp
@@ -12,7 +12,11 @@
}
class { '::apt':
stage => first,
+ before => Notify['force apt-get update'],
+}
+notify { 'force apt-get update':
notify => Exec['apt-get update'],
+ after => Class['::apt'],
}
# Jenkins provision jre by itself but it sounds better to have it already in
@@ -60,9 +64,7 @@
}
# For mediawiki/extensions/Collection/OfflineContentGenerator/bundler
-package { 'zip':
- ensure => present,
-}
+ensure_packages(['zip'])
ensure_packages(['openjdk-7-jre-headless'])
--
To view, visit https://gerrit.wikimedia.org/r/282360
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib59de69ad0d235193c5d96af35ab56dc259435ee
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
