Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/345550 )
Change subject: aptrepo: remove precise-wikimedia ...................................................................... aptrepo: remove precise-wikimedia precise is obsolete and gone now. Change-Id: Iffb347d25d4f8b575cdc5cdd56d22a54e708774a --- M modules/aptrepo/files/distributions-wikimedia M modules/aptrepo/files/updates M modules/aptrepo/templates/incoming-wikimedia.erb 3 files changed, 3 insertions(+), 28 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/aptrepo/files/distributions-wikimedia b/modules/aptrepo/files/distributions-wikimedia index 35ce22c..f4935b3 100644 --- a/modules/aptrepo/files/distributions-wikimedia +++ b/modules/aptrepo/files/distributions-wikimedia @@ -1,20 +1,5 @@ Origin: Wikimedia Label: Wikimedia -Suite: precise-wikimedia -Codename: precise-wikimedia -Version: 12.04 -Architectures: source amd64 i386 -Components: main universe non-free thirdparty mariadb -UDebComponents: main -Update: hwraid hp-mcp-precise -Description: Wikimedia specific packages for Ubuntu Precise -SignWith: 09DBD9F93F6CD44A -DebOverride: deb-override -Log: - log - -Origin: Wikimedia -Label: Wikimedia Suite: trusty-wikimedia Codename: trusty-wikimedia Version: 14.04 diff --git a/modules/aptrepo/files/updates b/modules/aptrepo/files/updates index 5a0cb4f..41a2f25 100644 --- a/modules/aptrepo/files/updates +++ b/modules/aptrepo/files/updates @@ -27,24 +27,14 @@ ListShellHook: grep-dctrl -e -S '^(avro-libs|bigtop-jsvc|bigtop-tomcat|bigtop-utils|crunch|hadoop|hbase|hive|hue|impala|kite|llama|mahout|oozie|parquet|parquet-format|pig|pig-udf-datafu|sentry|solr|flume-ng|spark-core|sqoop|sqoop2|whirr|zookeeper)$' || [ $? -eq 1 ] Name: hwraid -Method: http://hwraid.le-vert.net/ubuntu +Method: http://hwraid.le-vert.net/debian Components: main>thirdparty UDebComponents: GetInRelease: no -Suite: precise +Suite: jessie Architectures: amd64 source VerifyRelease: 6005210E23B3D3B4 ListShellHook: grep-dctrl -e -S '^megacli|arcconf|lsiutil$' || [ $? -eq 1 ] - -Name: hp-mcp-precise -Method: http://downloads.linux.hpe.com/SDR/repo/mcp -Components: non-free>thirdparty -UDebComponents: -GetInRelease: no -Suite: precise/current -Architectures: amd64 -VerifyRelease: FADD8D64B1275EA3|C208ADDE26C2B797 -ListShellHook: grep-dctrl -e -S '^hp-health|hpssa|hpssacli|hpssaducli|hpacucli$' || [ $? -eq 1 ] Name: hp-mcp-trusty Method: http://downloads.linux.hpe.com/SDR/repo/mcp diff --git a/modules/aptrepo/templates/incoming-wikimedia.erb b/modules/aptrepo/templates/incoming-wikimedia.erb index 2d1a7d2..f6ecb02 100644 --- a/modules/aptrepo/templates/incoming-wikimedia.erb +++ b/modules/aptrepo/templates/incoming-wikimedia.erb @@ -1,4 +1,4 @@ Name: default IncomingDir: <%= @incomingdir %> TempDir: /tmp -Allow: precise-wikimedia trusty-wikimedia jessie-wikimedia stretch-wikimedia precise>precise-wikimedia trusty>trusty-wikimedia jessie->jessie-wikimedia +Allow: trusty-wikimedia jessie-wikimedia stretch-wikimedia trusty>trusty-wikimedia jessie->jessie-wikimedia -- To view, visit https://gerrit.wikimedia.org/r/345550 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iffb347d25d4f8b575cdc5cdd56d22a54e708774a Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
