You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2011/10/31 01:30:06 UTC
svn commit: r1195290 [6/6] - in /incubator/bigtop/branches/hadoop-0.22: ./
bigtop-deploy/ bigtop-deploy/puppet/ bigtop-deploy/puppet/manifests/
bigtop-deploy/puppet/modules/ bigtop-deploy/puppet/modules/hadoop-flume/
bigtop-deploy/puppet/modules/hadoop...
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/pom.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/pom.xml?rev=1195290&r1=1195289&r2=1195290&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/pom.xml (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/pom.xml Mon Oct 31 00:30:01 2011
@@ -42,13 +42,56 @@
<module>sqoop</module>
</modules>
+ <properties>
+ <junit.version>4.8.2</junit.version>
+ <itest-common.version>0.2.0-incubating-SNAPSHOT</itest-common.version>
+ <hadoop.version>0.20.205.0</hadoop.version>
+ <pig.version>0.9.1</pig.version>
+ <sqoop.version>1.3.0</sqoop.version>
+ <hbase.version>0.90.4</hbase.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.bigtop.itest</groupId>
+ <artifactId>itest-common</artifactId>
+ <version>${itest-common.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase</artifactId>
+ <version>${hbase.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.bigtop.itest</groupId>
<artifactId>itest-common</artifactId>
- <version>0.2.0-incubating-SNAPSHOT</version>
</dependency>
-
</dependencies>
<build>
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-execution/smokes/hbase/pom.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-execution/smokes/hbase/pom.xml?rev=1195290&r1=1195289&r2=1195290&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-execution/smokes/hbase/pom.xml (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-execution/smokes/hbase/pom.xml Mon Oct 31 00:30:01 2011
@@ -90,7 +90,7 @@
<configuration>
<systemPropertyVariables>
<org.apache.bigtop.itest.hbasesmoke.TestHbasePigSmoke.extra_jars>
- ${ZOOKEEPER_HOME}/${zookeeper.jar}:${HBASE_HOME}/lib/${hbase.jar}:${HBASE_HOME}/lib/guava-r06.jar
+ ${ZOOKEEPER_HOME}/${zookeeper.jar}:${HBASE_HOME}/${hbase.jar}:${HBASE_HOME}/lib/guava-r06.jar
</org.apache.bigtop.itest.hbasesmoke.TestHbasePigSmoke.extra_jars>
</systemPropertyVariables>
</configuration>
@@ -117,7 +117,7 @@
}
project.properties['hbase.jar'] =
org.apache.bigtop.itest.JarContent.getJarName(
- "${HBASE_HOME}/lib", 'hbase-.*.jar');
+ "${HBASE_HOME}", 'hbase-.*.jar');
if ( project.properties['hbase.jar'] == null ) {
throw new IOException ("hbase*.jar isn't found");
}
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-execution/smokes/pom.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-execution/smokes/pom.xml?rev=1195290&r1=1195289&r2=1195290&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-execution/smokes/pom.xml (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-execution/smokes/pom.xml Mon Oct 31 00:30:01 2011
@@ -39,16 +39,17 @@
-->
<itest-conf.version>0.2.0-incubating-SNAPSHOT</itest-conf.version>
<itest-common.version>0.2.0-incubating-SNAPSHOT</itest-common.version>
- <hadoop.version>0.22.0-SNAPSHOT</hadoop.version>
<hadoop-smoke.version>0.2.0-incubating-SNAPSHOT</hadoop-smoke.version>
<flume-smoke.version>0.2.0-incubating-SNAPSHOT</flume-smoke.version>
<hbase-smoke.version>0.2.0-incubating-SNAPSHOT</hbase-smoke.version>
<hive-smoke.version>0.2.0-incubating-SNAPSHOT</hive-smoke.version>
<oozie-smoke.version>0.2.0-incubating-SNAPSHOT</oozie-smoke.version>
<package-smoke.version>0.2.0-incubating-SNAPSHOT</package-smoke.version>
+ <hadoop.version>0.22.0-SNAPSHOT</hadoop.version>
+ <hbase.version>0.92.0-SNAPSHOT</hbase.version>
<pig-smoke.version>0.9.0-SNAPSHOT</pig-smoke.version>
- <pig.version>0.9.0</pig.version>
- <sqoop.version>1.2.0-cdh3u0</sqoop.version>
+ <pig.version>0.9.1</pig.version>
+ <sqoop.version>1.3.0</sqoop.version>
<!--
End of BOM definitions
-->
@@ -108,6 +109,32 @@
<version>${hadoop.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common-test</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs-test</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapred</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase</artifactId>
+ <version>${hbase.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.pig</groupId>
<artifactId>pig</artifactId>
<version>${pig.version}</version>
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop.mk
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop.mk?rev=1195290&r1=1195289&r2=1195290&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop.mk (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop.mk Mon Oct 31 00:30:01 2011
@@ -37,7 +37,6 @@ ZOOKEEPER_PKG_VERSION=3.3.3
ZOOKEEPER_RELEASE_VERSION=1
ZOOKEEPER_TARBALL_DST=zookeeper-$(ZOOKEEPER_BASE_VERSION).tar.gz
ZOOKEEPER_TARBALL_SRC=$(ZOOKEEPER_TARBALL_DST)
-ZOOKEEPER_PACKAGE_GIT_REPO=$(REPO_DIR)/cdh3/zookeeper-package
ZOOKEEPER_SITE=$(APACHE_MIRROR)/zookeeper/zookeeper-3.3.3/
$(eval $(call PACKAGE,zookeeper,ZOOKEEPER))
@@ -45,18 +44,18 @@ $(eval $(call PACKAGE,zookeeper,ZOOKEEPE
HBASE_NAME=hbase
HBASE_RELNOTES_NAME=Apache HBase
HBASE_PKG_NAME=hadoop-hbase
-HBASE_BASE_VERSION=0.92
+HBASE_BASE_VERSION=0.92.0
HBASE_PKG_VERSION=$(HBASE_BASE_VERSION)
HBASE_RELEASE_VERSION=1
HBASE_TARBALL_DST=hbase-$(HBASE_BASE_VERSION).tar.gz
#HBASE_TARBALL_SRC=$(HBASE_TARBALL_DST)
#HBASE_SITE=$(APACHE_MIRROR)/hbase/hbase-0.90.4/
-HBASE_TARBALL_SRC=8146460
+HBASE_TARBALL_SRC=a07486c
HBASE_SITE=https://github.com/apache/hbase/tarball
$(eval $(call PACKAGE,hbase,HBASE))
# Pig
-PIG_BASE_VERSION=0.9.0
+PIG_BASE_VERSION=0.9.1
PIG_PKG_VERSION=$(PIG_BASE_VERSION)
PIG_RELEASE_VERSION=1
PIG_NAME=pig
@@ -71,7 +70,7 @@ $(eval $(call PACKAGE,pig,PIG))
HIVE_NAME=hive
HIVE_RELNOTES_NAME=Apache Hive
HIVE_PKG_NAME=hadoop-hive
-HIVE_BASE_VERSION=0.7.0
+HIVE_BASE_VERSION=0.7.1
HIVE_PKG_VERSION=$(HIVE_BASE_VERSION)
HIVE_RELEASE_VERSION=1
HIVE_TARBALL_DST=hive-$(HIVE_BASE_VERSION).tar.gz
@@ -100,7 +99,6 @@ OOZIE_PKG_VERSION=2.3.2
OOZIE_RELEASE_VERSION=1
OOZIE_TARBALL_DST=oozie-2.3.2.tar.gz
OOZIE_TARBALL_SRC=2.3.2
-OOZIE_PACKAGE_GIT_REPO=$(REPO_DIR)/cdh3/oozie-package
OOZIE_SITE=http://github.com/yahoo/oozie/tarball
$(eval $(call PACKAGE,oozie,OOZIE))
@@ -141,3 +139,12 @@ FLUME_TARBALL_DST=flume-$(FLUME_BASE_VER
FLUME_TARBALL_SRC=$(FLUME_TARBALL_DST)
FLUME_SITE=http://github.com/downloads/cloudera/flume/
$(eval $(call PACKAGE,flume,FLUME))
+
+# Bigtop-utils
+BIGTOP_UTILS_NAME=bigtop-utils
+BIGTOP_UTILS__RELNOTES_NAME=Bigtop-utils
+BIGTOP_UTILS_PKG_NAME=bigtop-utils
+BIGTOP_UTILS_BASE_VERSION=$(subst -,.,$(BIGTOP_VERSION))
+BIGTOP_UTILS_PKG_VERSION=$(BIGTOP_UTILS_BASE_VERSION)
+BIGTOP_UTILS_RELEASE_VERSION=1
+$(eval $(call PACKAGE,bigtop-utils,BIGTOP_UTILS))
Modified: incubator/bigtop/branches/hadoop-0.22/package.mk
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/package.mk?rev=1195290&r1=1195289&r2=1195290&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/package.mk (original)
+++ incubator/bigtop/branches/hadoop-0.22/package.mk Mon Oct 31 00:30:01 2011
@@ -20,7 +20,7 @@ SHELL := /bin/bash
$(BUILD_DIR)/%/.download:
mkdir -p $(@D)
mkdir -p $(DL_DIR)
- [ -f $($(PKG)_DOWNLOAD_DST) ] || (cd $(DL_DIR) && curl --retry 5 -# -L -k -o $($(PKG)_TARBALL_DST) $($(PKG)_DOWNLOAD_URL))
+ [ -z "$($(PKG)_TARBALL_SRC)" -o -f $($(PKG)_DOWNLOAD_DST) ] || (cd $(DL_DIR) && curl --retry 5 -# -L -k -o $($(PKG)_TARBALL_DST) $($(PKG)_DOWNLOAD_URL))
touch $@
# Make source RPMs
@@ -29,12 +29,13 @@ $(BUILD_DIR)/%/.srpm:
mkdir -p $(PKG_BUILD_DIR)/rpm/
cp -r $(BASE_DIR)/bigtop-packages/src/rpm/$($(PKG)_NAME)/* $(PKG_BUILD_DIR)/rpm/
mkdir -p $(PKG_BUILD_DIR)/rpm/{INSTALL,SOURCES,BUILD,SRPMS}
- cp $($(PKG)_DOWNLOAD_DST) $(PKG_BUILD_DIR)/rpm/SOURCES
+ [ -z "$($(PKG)_TARBALL_SRC)" ] || cp $($(PKG)_DOWNLOAD_DST) $(PKG_BUILD_DIR)/rpm/SOURCES
[ -d $(BASE_DIR)/bigtop-packages/src/common/$($(PKG)_NAME) ] && cp -r $(BASE_DIR)/bigtop-packages/src/common/$($(PKG)_NAME)/* $(PKG_BUILD_DIR)/rpm/SOURCES
+ PKG_NAME_FOR_PKG=$(subst -,_,$($(PKG)_NAME)); \
rpmbuild --define "_topdir $(PKG_BUILD_DIR)/rpm/" \
- --define "$($(PKG)_NAME)_base_version $($(PKG)_BASE_VERSION)" \
- --define "$($(PKG)_NAME)_version $($(PKG)_PKG_VERSION)$(BIGTOP_BUILD_STAMP)" \
- --define "$($(PKG)_NAME)_release $($(PKG)_RELEASE_VERSION)" \
+ --define "$${PKG_NAME_FOR_PKG}_base_version $($(PKG)_BASE_VERSION)" \
+ --define "$${PKG_NAME_FOR_PKG}_version $($(PKG)_PKG_VERSION)$(BIGTOP_BUILD_STAMP)" \
+ --define "$${PKG_NAME_FOR_PKG}_release $($(PKG)_RELEASE_VERSION)" \
-bs \
--nodeps \
--buildroot="$(PKG_BUILD_DIR)/rpm/INSTALL" \
@@ -64,16 +65,21 @@ $(BUILD_DIR)/%/.yum: $(BUILD_DIR)/%/.rpm
$(BUILD_DIR)/%/.sdeb:
-rm -rf $(PKG_BUILD_DIR)/deb/
mkdir -p $(PKG_BUILD_DIR)/deb/$($(PKG)_NAME)-$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP)
- cp $($(PKG)_DOWNLOAD_DST) $(PKG_BUILD_DIR)/deb/$($(PKG)_PKG_NAME)_$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP).orig.tar.gz
- cd $(PKG_BUILD_DIR)/deb/$($(PKG)_NAME)-$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP) && \
- tar --strip-components 1 -xvf ../$($(PKG)_PKG_NAME)_$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP).orig.tar.gz
+ # Only expands the tar if there is a source artifact
+ if [ -n "$($(PKG)_TARBALL_SRC)" ]; then \
+ cp $($(PKG)_DOWNLOAD_DST) $(PKG_BUILD_DIR)/deb/$($(PKG)_PKG_NAME)_$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP).orig.tar.gz ;\
+ cd $(PKG_BUILD_DIR)/deb/$($(PKG)_NAME)-$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP) && \
+ tar --strip-components 1 -xvf ../$($(PKG)_PKG_NAME)_$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP).orig.tar.gz;\
+ else \
+ tar -czf $(PKG_BUILD_DIR)/deb/$($(PKG)_PKG_NAME)_$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP).orig.tar.gz LICENSE ;\
+ fi
cd $(PKG_BUILD_DIR)/deb/$($(PKG)_NAME)-$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP) && \
cp -r $(BASE_DIR)/bigtop-packages/src/deb/$($(PKG)_NAME) debian && \
cp -r $(BASE_DIR)/bigtop-packages/src/common/$($(PKG)_NAME)/* debian && \
echo -e "version=$(PKG_PKG_VERSION)\ngit.hash=deadbeaf" >> debian/build.properties && \
(echo -e "$($(PKG)_PKG_NAME) ($(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP)-$($(PKG)_RELEASE)) stable; urgency=low\n" && \
echo " Clean build" && \
- echo " -- Jenkins <je...@cloudera.com> "`date +'%a, %d %b %Y %T %z'`) > debian/changelog && \
+ echo " -- Bigtop <bi...@incubator.apache.org> "`date +'%a, %d %b %Y %T %z'`) > debian/changelog && \
find debian -name "*.[ex,EX,~]" | xargs rm -f && \
dpkg-buildpackage -uc -us -sa -S
mkdir -p $($(PKG)_OUTPUT_DIR)/
@@ -81,8 +87,8 @@ $(BUILD_DIR)/%/.sdeb:
$($(PKG)_PKG_NAME)_$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP)-$($(PKG)_RELEASE).diff.gz \
$($(PKG)_PKG_NAME)_$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP)-$($(PKG)_RELEASE)_source.changes \
$($(PKG)_PKG_NAME)_$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP).orig.tar.gz ; \
- do cp $(PKG_BUILD_DIR)/deb/$$file $($(PKG)_OUTPUT_DIR); \
- done
+ do [ -e $(PKG_BUILD_DIR)/deb/$$file ] && cp $(PKG_BUILD_DIR)/deb/$$file $($(PKG)_OUTPUT_DIR); \
+ done
touch $@
$(BUILD_DIR)/%/.deb: SRCDEB=$($(PKG)_PKG_NAME)_$($(PKG)_PKG_VERSION)$(BIGTOP_BUILD_STAMP)-$($(PKG)_RELEASE).dsc