Yuvipanda has submitted this change and it was merged.
Change subject: Tools: Split local apt repository by OS release
......................................................................
Tools: Split local apt repository by OS release
Currently instances running Ubuntu Precise and Ubuntu Trusty share the
same local apt repository. This leads to various unresolvable
dependency conflicts.
With this change, each OS release gets its own local apt repository
(e. g. /data/project/.system/deb-trusty) so that they can be managed
individually.
Bug: T76802
Change-Id: I8e50efdab45aad5ecfd03a2fbf3a7ac6d8a09810
---
M modules/toollabs/manifests/init.pp
1 file changed, 9 insertions(+), 4 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/manifests/init.pp
b/modules/toollabs/manifests/init.pp
index 1224841..527ca48 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -17,7 +17,7 @@
$sysdir = '/data/project/.system'
$store = "${sysdir}/store"
- $repo = "${sysdir}/deb"
+ $repo = "${sysdir}/deb-${::lsbdistcodename}"
#
# The $store is an incredibly horrid workaround the fact that we cannot
@@ -116,9 +116,14 @@
group => 'root',
}
- # We keep a project-local apt repo where we stuff packages we build
- # that are intended to be local to the project. By keeping it on the
- # shared storage, we have no need to set up a server to use it.
+ # We keep a project-local apt repo where we stuff packages we
+ # build that are intended to be local to the project. By keeping
+ # it on the shared storage, we have no need to set up a server to
+ # use it. The repo is located in
+ # /data/project/.system/deb-jessie,
+ # /data/project/.system/deb-precise or
+ # /data/project/.system/deb-trusty depending on the instance's OS
+ # release.
labsdebrepo { $toollabs::repo:
handle => 'tools-project',
require => File[$toollabs::sysdir],
--
To view, visit https://gerrit.wikimedia.org/r/195079
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8e50efdab45aad5ecfd03a2fbf3a7ac6d8a09810
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <[email protected]>
Gerrit-Reviewer: Tim Landscheidt <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
