This is an automated email from the ASF dual-hosted git repository.
sekikn pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 00e9433 BIGTOP-3648. Change download site to dlcdn.apache.org for
installing Ant and Maven. (#869)
00e9433 is described below
commit 00e9433bfb5b6176b296077f6e468b37e010cd7b
Author: Kengo Seki <[email protected]>
AuthorDate: Mon Feb 28 08:16:36 2022 +0900
BIGTOP-3648. Change download site to dlcdn.apache.org for installing Ant
and Maven. (#869)
(cherry picked from commit ea790db0c4fc6c5c0590cc86b3c736b766b857d8)
---
bigtop-deploy/puppet/hieradata/bigtop/repo.yaml | 2 +-
bigtop-packages/src/common/ambari/patch5-AMBARI-25599.diff | 2 +-
bigtop_toolchain/lib/puppet/parser/functions/latest_ant_binary.rb | 2 +-
bigtop_toolchain/lib/puppet/parser/functions/latest_maven_binary.rb | 2 +-
bigtop_toolchain/manifests/ant.pp | 2 +-
bigtop_toolchain/manifests/maven.pp | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/bigtop-deploy/puppet/hieradata/bigtop/repo.yaml
b/bigtop-deploy/puppet/hieradata/bigtop/repo.yaml
index 6b4ecba..8632f0e 100644
--- a/bigtop-deploy/puppet/hieradata/bigtop/repo.yaml
+++ b/bigtop-deploy/puppet/hieradata/bigtop/repo.yaml
@@ -1,5 +1,5 @@
bigtop::bigtop_repo_gpg_check: true
bigtop::bigtop_repo_apt_key: "01621A73025BDCA30F4159C62922A48261524827"
-bigtop::bigtop_repo_yum_key_url: "https://downloads.apache.org/bigtop/KEYS";
+bigtop::bigtop_repo_yum_key_url: "https://dlcdn.apache.org/bigtop/KEYS";
bigtop::bigtop_repo_default_version: "3.0.0"
diff --git a/bigtop-packages/src/common/ambari/patch5-AMBARI-25599.diff
b/bigtop-packages/src/common/ambari/patch5-AMBARI-25599.diff
index 8d723cf..3bf103e 100644
--- a/bigtop-packages/src/common/ambari/patch5-AMBARI-25599.diff
+++ b/bigtop-packages/src/common/ambari/patch5-AMBARI-25599.diff
@@ -64,7 +64,7 @@ index a0a11b8e6e..282041fab6 100644
+ <hadoop.folder>hadoop-3.1.1</hadoop.folder>
+ <grafana.folder>grafana-6.7.4</grafana.folder>
+
<grafana.tar>https://dl.grafana.com/oss/release/grafana-6.7.4.linux-amd64.tar.gz</grafana.tar>
-+
<phoenix.tar>https://downloads.apache.org/phoenix/apache-phoenix-5.0.0-HBase-2.0/bin/apache-phoenix-5.0.0-HBase-2.0-bin.tar.gz</phoenix.tar>
++
<phoenix.tar>https://dlcdn.apache.org/phoenix/apache-phoenix-5.0.0-HBase-2.0/bin/apache-phoenix-5.0.0-HBase-2.0-bin.tar.gz</phoenix.tar>
+ <phoenix.folder>apache-phoenix-5.0.0-HBase-2.0-bin</phoenix.folder>
<resmonitor.install.dir>/usr/lib/python2.6/site-packages/resource_monitoring</resmonitor.install.dir>
<powermock.version>1.6.2</powermock.version>
diff --git a/bigtop_toolchain/lib/puppet/parser/functions/latest_ant_binary.rb
b/bigtop_toolchain/lib/puppet/parser/functions/latest_ant_binary.rb
index 78b9b6c..0e90fd7 100644
--- a/bigtop_toolchain/lib/puppet/parser/functions/latest_ant_binary.rb
+++ b/bigtop_toolchain/lib/puppet/parser/functions/latest_ant_binary.rb
@@ -17,6 +17,6 @@ module Puppet::Parser::Functions
newfunction(:latest_ant_binary, :type => :rvalue) do |args|
versionmask=args[0]
# We are using main mirror here because can't be sure about Apache
Server config on every mirror. It could be Nginx, btw.
- %x(curl -L --stderr /dev/null
'https://downloads.apache.org/ant/binaries/?F=0&V=1' | grep -o
'<li>.*href="apache-ant-#{versionmask}-bin.tar.gz"' | grep -o
"apache-ant-#{versionmask}" | tail -1 | tr -d '\r').chomp
+ %x(curl -L --stderr /dev/null
'https://dlcdn.apache.org/ant/binaries/?F=0&V=1' | grep -o
'<li>.*href="apache-ant-#{versionmask}-bin.tar.gz"' | grep -o
"apache-ant-#{versionmask}" | tail -1 | tr -d '\r').chomp
end
end
diff --git
a/bigtop_toolchain/lib/puppet/parser/functions/latest_maven_binary.rb
b/bigtop_toolchain/lib/puppet/parser/functions/latest_maven_binary.rb
index ff92b91..82da54d 100644
--- a/bigtop_toolchain/lib/puppet/parser/functions/latest_maven_binary.rb
+++ b/bigtop_toolchain/lib/puppet/parser/functions/latest_maven_binary.rb
@@ -17,6 +17,6 @@ module Puppet::Parser::Functions
newfunction(:latest_maven_binary, :type => :rvalue) do |args|
versionmask=args[0]
# We are using main mirror here because can't be sure about Apache
Server config on every mirror. It could be Nginx, btw.
- %x(curl -L --stderr /dev/null
'https://downloads.apache.org/maven/maven-3/?F=0&V=1' | grep -o
'<li>.*href="#{versionmask}/"' | tail -1 | grep -o '#{versionmask}'| tr -d
'\r').chomp
+ %x(curl -L --stderr /dev/null
'https://dlcdn.apache.org/maven/maven-3/?F=0&V=1' | grep -o
'<li>.*href="#{versionmask}/"' | tail -1 | grep -o '#{versionmask}'| tr -d
'\r').chomp
end
end
diff --git a/bigtop_toolchain/manifests/ant.pp
b/bigtop_toolchain/manifests/ant.pp
index 8ee9226..65319a2 100644
--- a/bigtop_toolchain/manifests/ant.pp
+++ b/bigtop_toolchain/manifests/ant.pp
@@ -29,7 +29,7 @@ class bigtop_toolchain::ant {
} ~>
exec { 'Download Ant binaries signature':
- command => "/usr/bin/wget
https://www.apache.org/dist/ant/binaries/$ant-bin.tar.gz.asc";,
+ command => "/usr/bin/wget $apache_prefix/ant/binaries/$ant-bin.tar.gz.asc",
cwd => "/usr/src",
unless => "/usr/bin/test -f /usr/src/$ant-bin.tar.gz.asc",
} ~>
diff --git a/bigtop_toolchain/manifests/maven.pp
b/bigtop_toolchain/manifests/maven.pp
index 55318ce..8b95ac7 100644
--- a/bigtop_toolchain/manifests/maven.pp
+++ b/bigtop_toolchain/manifests/maven.pp
@@ -30,7 +30,7 @@ class bigtop_toolchain::maven {
} ~>
exec { 'Download Maven binaries signature':
- command => "/usr/bin/wget
https://www.apache.org/dist/maven/maven-3/$mvnversion/binaries/$mvn-bin.tar.gz.asc";,
+ command => "/usr/bin/wget
$apache_prefix/maven/maven-3/$mvnversion/binaries/$mvn-bin.tar.gz.asc",
cwd => "/usr/src",
unless => "/usr/bin/test -f /usr/src/$mvn-bin.tar.gz.asc",
} ~>
