Ottomata has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364467 )
Change subject: Use pulls rather than updates to pull cloudera jessie packages into stretch-wikimedia ...................................................................... Use pulls rather than updates to pull cloudera jessie packages into stretch-wikimedia Bug: T152712 Change-Id: Ibcd2cb356e12ae9110dfbd6c5f5c6d77525d2c18 --- M modules/aptrepo/files/distributions-wikimedia A modules/aptrepo/files/pulls M modules/aptrepo/files/updates M modules/aptrepo/manifests/init.pp 4 files changed, 18 insertions(+), 15 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved diff --git a/modules/aptrepo/files/distributions-wikimedia b/modules/aptrepo/files/distributions-wikimedia index 054ac99..1cc4040 100644 --- a/modules/aptrepo/files/distributions-wikimedia +++ b/modules/aptrepo/files/distributions-wikimedia @@ -38,7 +38,13 @@ Architectures: source amd64 i386 Components: main backports thirdparty experimental thirdparty/cloudera UDebComponents: main backports thirdparty experimental -Update: hwraid hp-mcp-jessie cloudera-stretch +Update: hwraid hp-mcp-jessie +# NOTE: Cloudera does not (yet) provide Stretch packages. We use the Jessie ones, +# along with a fake equivs to satisfy hadoop-mapreduce's (unnecessary) dependency on libssl1.0.0 +# which is not available in Stretch. Once Cloudera releases Stretch packages, we can +# use updates to mirror from Cloudera, rather than pulling them into stretch from +# jessie-wikimedia distribution. +Pull: cloudera-jessie-pull Description: Wikimedia packages for Debian stretch SignWith: 9D392D3FFADF18FB DebOverride: deb-override diff --git a/modules/aptrepo/files/pulls b/modules/aptrepo/files/pulls new file mode 100644 index 0000000..faa89a6 --- /dev/null +++ b/modules/aptrepo/files/pulls @@ -0,0 +1,3 @@ +Name: cloudera-jessie-pull +From: jessie-wikimedia +Components: thirdparty/cloudera diff --git a/modules/aptrepo/files/updates b/modules/aptrepo/files/updates index 864d94e..6474238 100644 --- a/modules/aptrepo/files/updates +++ b/modules/aptrepo/files/updates @@ -26,20 +26,6 @@ VerifyRelease: 327574EE02A818DD 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 ] -# NOTE: Cloudera does not (yet) provide Stretch packages. We use the Jessie ones, -# along with a fake equivs to satisfy hadoop-mapreduce's (unnecessary) dependency on libssl1.0.0 -# which is not available in Stretch. Once Cloudera releases Stretch packages, we can -# point this at those instead of the Jessie ones. -Name: cloudera-stretch -Method: http://archive.cloudera.com/cdh5/debian/jessie/amd64/cdh/ -Components: contrib>thirdparty/cloudera -UDebComponents: -Suite: jessie-cdh5.10.0 -Architectures: amd64 source -VerifyRelease: 327574EE02A818DD -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/debian Components: main>thirdparty diff --git a/modules/aptrepo/manifests/init.pp b/modules/aptrepo/manifests/init.pp index 9113177..9844a38 100644 --- a/modules/aptrepo/manifests/init.pp +++ b/modules/aptrepo/manifests/init.pp @@ -98,6 +98,14 @@ source => 'puppet:///modules/aptrepo/updates', } + file { "${basedir}/conf/pulls": + ensure => present, + mode => '0444', + owner => 'root', + group => 'root', + source => 'puppet:///modules/aptrepo/pulls', + } + file { "${basedir}/conf/options": ensure => file, owner => $user, -- To view, visit https://gerrit.wikimedia.org/r/364467 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibcd2cb356e12ae9110dfbd6c5f5c6d77525d2c18 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ottomata <[email protected]> Gerrit-Reviewer: Ottomata <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
