Skip to content

Commit 07def7e

Browse files
toddlipconcloudera-hudson
authored andcommitted
IMPALA-8516. Update maven for Jenkins builds
This changes Maven to download and install on both Ubuntu and Redhat for the Jenkins builds (previously it was only installed on Redhat). The version number is kept at 3.5.4 even though a newer release is available upstream. The new release fails to build Impala due to an XML-parsing bug causing it to fail to resolve the parquet pom [1] This should hopefully address some of the hang issues we've seen previously with the older version of Maven that shipped with the version of Ubuntu we have on Ubuntu 16.04. [1] codehaus-plexus/plexus-utils#65 Change-Id: I793409eb4e9f4533b75bfe089a497c0ea62ad1ff Reviewed-on: http://gerrit.cloudera.org:8080/13268 Tested-by: Impala Public Jenkins <[email protected]> Reviewed-by: Todd Lipcon <[email protected]>
1 parent 00d8118 commit 07def7e

File tree

2 files changed

+22
-7
lines changed

2 files changed

+22
-7
lines changed

bin/bootstrap_build.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ set -euxo pipefail
3131

3232
# Install non-java dependencies:
3333
sudo apt-get update
34-
sudo apt-get --yes install g++ gcc git libsasl2-dev libssl-dev make maven \
34+
sudo apt-get --yes install g++ gcc git libsasl2-dev libssl-dev make \
3535
python-dev python-setuptools libffi-dev libkrb5-dev
3636

3737

@@ -45,4 +45,13 @@ fi
4545
sudo apt-get --yes install openjdk-${JDK_VERSION}-jdk openjdk-${JDK_VERSION}-source
4646
export JAVA_HOME=/usr/lib/jvm/java-${JDK_VERSION}-openjdk-amd64
4747

48+
# Download Maven since the packaged version is pretty old.
49+
if [ ! -d /usr/local/apache-maven-3.5.4 ]; then
50+
sudo wget -nv \
51+
https://www-us.apache.org/dist/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.tar.gz
52+
sha512sum -c - <<< '2a803f578f341e164f6753e410413d16ab60fabe31dc491d1fe35c984a5cce696bc71f57757d4538fe7738be04065a216f3ebad4ef7e0ce1bb4c51bc36d6be86 apache-maven-3.5.4-bin.tar.gz'
53+
sudo tar -C /usr/local -xzf apache-maven-3.5.4-bin.tar.gz
54+
sudo ln -s /usr/local/apache-maven-3.5.4/bin/mvn /usr/local/bin
55+
fi
56+
4857
./buildall.sh -notests -so

bin/bootstrap_system.sh

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ echo ">>> Installing build tools"
189189
ubuntu apt-get update
190190
ubuntu apt-get --yes install ccache g++ gcc libffi-dev liblzo2-dev libkrb5-dev \
191191
krb5-admin-server krb5-kdc krb5-user libsasl2-dev libsasl2-modules \
192-
libsasl2-modules-gssapi-mit libssl-dev make maven ninja-build ntp \
192+
libsasl2-modules-gssapi-mit libssl-dev make ninja-build ntp \
193193
ntpdate python-dev python-setuptools postgresql ssh wget vim-common psmisc \
194194
lsof openjdk-8-jdk openjdk-8-source openjdk-8-dbg apt-utils git ant
195195

@@ -235,17 +235,23 @@ redhat sudo yum install -y ccache
235235
# Clean up yum caches
236236
redhat sudo yum clean all
237237

238-
# Download ant and mvn for centos
238+
# Download ant for centos
239239
redhat sudo wget -nv \
240-
https://www-us.apache.org/dist/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.tar.gz \
241240
https://www-us.apache.org/dist/ant/binaries/apache-ant-1.9.13-bin.tar.gz
242-
redhat sha512sum -c - <<< '2a803f578f341e164f6753e410413d16ab60fabe31dc491d1fe35c984a5cce696bc71f57757d4538fe7738be04065a216f3ebad4ef7e0ce1bb4c51bc36d6be86 apache-maven-3.5.4-bin.tar.gz'
243241
redhat sha512sum -c - <<< 'c8321aa223f70d7e64d3d0274263000cfffb46fbea61488534e26f9f0245d99e9872d0888e35cd3274416392a13f80c748c07750caaeffa5f9cae1220020715f apache-ant-1.9.13-bin.tar.gz'
244-
redhat sudo tar -C /usr/local -xzf apache-maven-3.5.4-bin.tar.gz
245242
redhat sudo tar -C /usr/local -xzf apache-ant-1.9.13-bin.tar.gz
246-
redhat sudo ln -s /usr/local/apache-maven-3.5.4/bin/mvn /usr/local/bin
247243
redhat sudo ln -s /usr/local/apache-ant-1.9.13/bin/ant /usr/local/bin
248244

245+
# Download maven for all OSes, since the OS-packaged version can be
246+
# pretty old.
247+
if [ ! -d /usr/local/apache-maven-3.5.4 ]; then
248+
sudo wget -nv \
249+
https://www-us.apache.org/dist/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.tar.gz
250+
sha512sum -c - <<< '2a803f578f341e164f6753e410413d16ab60fabe31dc491d1fe35c984a5cce696bc71f57757d4538fe7738be04065a216f3ebad4ef7e0ce1bb4c51bc36d6be86 apache-maven-3.5.4-bin.tar.gz'
251+
sudo tar -C /usr/local -xzf apache-maven-3.5.4-bin.tar.gz
252+
sudo ln -s /usr/local/apache-maven-3.5.4/bin/mvn /usr/local/bin
253+
fi
254+
249255
if ! { service --status-all | grep -E '^ \[ \+ \] ssh$'; }
250256
then
251257
ubuntu sudo service ssh start

0 commit comments

Comments
 (0)