소스 검색

AMBARI-11917: [WinTP2] Windows build should use hbase and hadoop winpkg for embedded hbase (jluniya)

Jayush Luniya 10 년 전
부모
커밋
a0a2524a50

+ 2 - 2
ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector-windows.xml

@@ -27,7 +27,7 @@
   <includeBaseDirectory>false</includeBaseDirectory>
   <fileSets>
     <fileSet>
-      <directory>${collector.dir}/target/embedded/${hbase.folder}</directory>
+      <directory>${collector.dir}/target/embedded/${hbase.winpkg.folder}</directory>
       <outputDirectory>hbase</outputDirectory>
     </fileSet>
     <fileSet>
@@ -80,7 +80,7 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>${project.build.directory}/embedded/hadoop.temp/resources/${hadoop.folder}/bin</directory>
+      <directory>${project.build.directory}/embedded/hadoop.temp/resources/${hadoop.winpkg.folder}/bin</directory>
       <outputDirectory>hbase/bin</outputDirectory>
       <includes>
         <include>*.dll</include>

+ 2 - 2
ambari-metrics/ambari-metrics-timelineservice/pom.xml

@@ -586,12 +586,12 @@
                       dest="${project.build.directory}/embedded/hbase.temp"
                       />
                     <unzip
-                      src="${project.build.directory}/embedded/hbase.temp/resources/${hbase.folder}.zip"
+                      src="${project.build.directory}/embedded/hbase.temp/resources/${hbase.winpkg.folder}.zip"
                       dest="${project.build.directory}/embedded"
                       />
                     <copy
                       file="${project.build.directory}/embedded/hbase.temp/resources/servicehost.exe"
-                      tofile="${project.build.directory}/embedded/${hbase.folder}/bin/ams_hbase_master.exe"
+                      tofile="${project.build.directory}/embedded/${hbase.winpkg.folder}/bin/ams_hbase_master.exe"
                       />
                   </target>
                 </configuration>

+ 4 - 2
ambari-metrics/pom.xml

@@ -40,8 +40,10 @@
     <hbase.folder>hbase-0.98.4.2.2.0.0-2041-hadoop2</hbase.folder>
     <hadoop.tar>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0/tars/hadoop-2.6.0.2.2.0.0-2041.tar.gz</hadoop.tar>
     <hadoop.folder>hadoop-2.6.0.2.2.0.0-2041</hadoop.folder>
-    <hbase.winpkg.zip>file:///c:/hbase_embedded/hbase-0.98.4.2.2.0.0-2041-hadoop2.winpkg.zip</hbase.winpkg.zip>
-    <hadoop.winpkg.zip>file:///c:/hbase_embedded/hadoop-2.6.0.2.2.0.0-2041.winpkg.zip</hadoop.winpkg.zip>
+    <hbase.winpkg.zip>https://msibuilds.blob.core.windows.net/hdp/2.x/2.2.4.2/2/hbase-0.98.4.2.2.4.2-0002-hadoop2.winpkg.zip</hbase.winpkg.zip>
+    <hbase.winpkg.folder>hbase-0.98.4.2.2.4.2-0002-hadoop2</hbase.winpkg.folder>
+    <hadoop.winpkg.zip>https://msibuilds.blob.core.windows.net/hdp/2.x/2.2.4.2/2/hadoop-2.6.0.2.2.4.2-0002.winpkg.zip</hadoop.winpkg.zip>
+    <hadoop.winpkg.folder>hadoop-2.6.0.2.2.4.2-0002</hadoop.winpkg.folder>
     <resmonitor.install.dir>
       /usr/lib/python2.6/site-packages/resource_monitoring
     </resmonitor.install.dir>