瀏覽代碼

[oozie] Upload test sharelib with the Oozie command

Romain Rigaux 12 年之前
父節點
當前提交
e129263
共有 2 個文件被更改,包括 14 次插入4 次删除
  1. 13 3
      desktop/libs/liboozie/src/liboozie/oozie_api_test.py
  2. 1 1
      tools/jenkins/build-functions

+ 13 - 3
desktop/libs/liboozie/src/liboozie/oozie_api_test.py

@@ -146,13 +146,23 @@ class OozieServerProvider(object):
 
   @classmethod
   def _setup_sharelib(cls):
-    # At some point could reuse:
-    # oozie-setup.sh sharelib create -fs FS_URI
     LOG.info("Copying Oozie sharelib")
     user_home = cls.cluster.fs.do_as_user(getpass.getuser(), cls.cluster.fs.get_home_dir)
     oozie_share_lib = user_home + '/share'
     cls.cluster.fs.do_as_user(getpass.getuser(), cls.cluster.fs.create_home_dir)
-    cls.cluster.fs.do_as_user(getpass.getuser(), cls.cluster.fs.copyFromLocal, OozieServerProvider.OOZIE_HOME + '/share', oozie_share_lib)
+
+    env = os.environ
+    args = [
+        OozieServerProvider.OOZIE_HOME + '/bin/oozie-setup.sh',
+        'sharelib',
+        'create',
+        '-fs',
+        cls.cluster.fs.fs_defaultfs,
+        '-locallib',
+        OozieServerProvider.OOZIE_HOME + '/oozie-sharelib.tar.gz'
+    ]
+    LOG.info("Executing %s, env %s" % (args, env))
+    subprocess.call(args, env=env)
     LOG.info("Oozie sharelib copied to %s" % oozie_share_lib)
 
   @classmethod

+ 1 - 1
tools/jenkins/build-functions

@@ -133,7 +133,7 @@ build_oozie() {
   HADOOP_LIB=`echo "${CDH_VERSION}" | sed -r 's/hadoop/hadooplib/g'`
   cp $OOZIE_HOME/libext/oozie-*/hadooplibs/${HADOOP_LIB}*/*jar $OOZIE_HOME/libext/
   tar -C $OOZIE_HOME -zxvf $OOZIE_HOME/oozie-examples.tar.gz
-  tar -C $OOZIE_HOME -zxvf $OOZIE_HOME/oozie-sharelib-*-yarn.tar.gz
+  cp  $OOZIE_HOME/oozie-sharelib-*-yarn.tar.gz $OOZIE_HOME/oozie-sharelib.tar.gz
 
   $OOZIE_HOME/bin/oozie-setup.sh prepare-war
   $OOZIE_HOME/bin/ooziedb.sh create -sqlfile oozie.sql -run