浏览代码

[build] Point pom to build against CDH4 nightly jars

* Update jenkins script to use CDH4 tarballs
* (Finally) renamed `hudson' to `jenkins'.
* Download MR1 tarball
bc Wong 13 年之前
父节点
当前提交
7ffb540527

+ 3 - 3
maven/pom.xml

@@ -27,7 +27,7 @@
 
   <groupId>com.cloudera.hue</groupId>
   <artifactId>hue-parent</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Hue Maven Parent POM</name>
@@ -42,10 +42,10 @@
   </licenses>
 
   <properties>
-    <hadoop.version>0.20.2-cdh3u3-SNAPSHOT</hadoop.version>
+    <hadoop.version>0.23.0-mr1-cdh4b2-SNAPSHOT</hadoop.version>
+    <hive.version>0.8.0-cdh4b2-SNAPSHOT</hive.version>
     <slf4j.version>1.6.1</slf4j.version>
     <commons-logging.version>1.0.4</commons-logging.version>
-    <hive.version>0.7.1-cdh3u3-SNAPSHOT</hive.version>
   </properties>
 
   <organization>

+ 28 - 2
tools/hudson/build-functions → tools/jenkins/build-functions

@@ -21,7 +21,7 @@
 # If not specified, it uses the $CDH variable to select an archive location.
 #
 
-CDH_URL=${CDH_URL:-http://archive.cloudera.com/cdh/3/hadoop-0.20.2-cdh3u2.tar.gz}
+CDH_URL=${CDH_URL:-http://nightly.cloudera.com/cdh4/cdh/4/hadoop-0.23.3-cdh4b2-SNAPSHOT.tar.gz}
 
 CDH_TGZ=$(basename $CDH_URL)
 CDH_VERSION=${CDH_TGZ/.tar.gz/}
@@ -43,7 +43,33 @@ build_hadoop() {
   tar -C $HADOOP_DIR -xzf $CDH_CACHE
 }
 
-HIVE_URL=${HIVE_URL:-http://archive.cloudera.com/cdh/3/hive-0.7.1-cdh3u2.tar.gz}
+##########
+
+MR1_URL=${MR1_URL:-http://nightly.cloudera.com/cdh4/cdh/4/mr1-0.23.3-mr1-cdh4b2-SNAPSHOT.tar.gz}
+
+MR1_TGZ=$(basename $MR1_URL)
+MR1_VERSION=${MR1_TGZ/.tar.gz/}
+MR1_CACHE="$HOME/.hue_cache/${MR1_TGZ}"
+
+build_mr1() {
+  if [ ! -f $MR1_CACHE ]; then
+    mkdir -p $HOME/.hue_cache
+    echo "Downloading $MR1_URL..."
+    wget $MR1_URL -O $MR1_CACHE
+  fi
+
+  MR1_DIR=$HUE_ROOT/ext/mr1
+  export HADOOP_MR1_HOME="$MR1_DIR/${MR1_VERSION}"
+
+  mkdir -p $MR1_DIR
+  rm -rf $HADOOP_MR1_HOME
+  echo "Unpacking $MR1_CACHE to $MR1_DIR"
+  tar -C $MR1_DIR -xzf $MR1_CACHE
+}
+
+##########
+
+HIVE_URL=${HIVE_URL:-http://nightly.cloudera.com/cdh4/cdh/4/hive-0.8.1-cdh4b2-SNAPSHOT.tar.gz}
 
 HIVE_TGZ=$(basename $HIVE_URL)
 HIVE_VERSION=${HIVE_TGZ/.tar.gz/}

+ 0 - 0
tools/hudson/hudson-prod-tarball.sh → tools/jenkins/jenkins-prod-tarball.sh


+ 1 - 0
tools/hudson/hudson.sh → tools/jenkins/jenkins.sh

@@ -39,6 +39,7 @@ else
 fi
 
 build_hadoop
+build_mr1
 build_hive
 
 make apps

+ 0 - 0
tools/hudson/hudson_windmill_in_X.sh → tools/jenkins/jenkins_windmill_in_X.sh