Browse Source

HUE-604. [Build] Jenkins build should remove old hadoop and hive directories

Also updated the default to the latest CDH3u2 release.
bc Wong 14 years ago
parent
commit
0e0366712c
1 changed files with 6 additions and 4 deletions
  1. 6 4
      tools/hudson/build-functions

+ 6 - 4
tools/hudson/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-CDH3B4.tar.gz}
+CDH_URL=${CDH_URL:-http://archive.cloudera.com/cdh/3/hadoop-0.20.2-cdh3u2.tar.gz}
 
 CDH_TGZ=$(basename $CDH_URL)
 CDH_VERSION=${CDH_TGZ/.tar.gz/}
@@ -35,14 +35,15 @@ build_hadoop() {
   fi
 
   HADOOP_DIR=$HUE_ROOT/ext/hadoop
+  export HADOOP_HOME="$HADOOP_DIR/${CDH_VERSION}"
 
   mkdir -p $HADOOP_DIR
+  rm -rf $HADOOP_HOME
   echo "Unpacking $CDH_CACHE to $HADOOP_DIR"
   tar -C $HADOOP_DIR -xzf $CDH_CACHE
-  export HADOOP_HOME="$HADOOP_DIR/${CDH_VERSION}"
 }
 
-HIVE_URL=${HIVE_URL:-http://archive.cloudera.com/cdh/3/hive-0.7.0-CDH3B4.tar.gz}
+HIVE_URL=${HIVE_URL:-http://archive.cloudera.com/cdh/3/hive-0.7.1-cdh3u2.tar.gz}
 
 HIVE_TGZ=$(basename $HIVE_URL)
 HIVE_VERSION=${HIVE_TGZ/.tar.gz/}
@@ -56,10 +57,11 @@ build_hive() {
   fi
 
   HIVE_DIR=$HUE_ROOT/ext/hive
+  export HIVE_HOME="$HIVE_DIR/${HIVE_VERSION}"
 
   mkdir -p $HIVE_DIR
+  rm -rf $HIVE_HOME
   echo "Unpacking $HIVE_CACHE to $HIVE_DIR"
   tar -C $HIVE_DIR -xzf $HIVE_CACHE
-  export HIVE_HOME="$HIVE_DIR/${HIVE_VERSION}"
   export HIVE_CONF_DIR=$HIVE_HOME/conf
 }