You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by co...@apache.org on 2014/04/25 01:05:53 UTC
[44/50] git commit: Merge remote-tracking branch 'public/master'
Merge remote-tracking branch 'public/master'
Conflicts:
bigtop.mk
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/826c9bc3
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/826c9bc3
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/826c9bc3
Branch: refs/heads/master
Commit: 826c9bc3a28e9e4138ebc0f6c56741a4c1647e8d
Parents: 67e1f6c 2a49603
Author: Konstantin Boudnik <co...@apache.org>
Authored: Mon Mar 10 11:33:53 2014 -0700
Committer: Konstantin Boudnik <co...@apache.org>
Committed: Mon Mar 10 11:33:53 2014 -0700
----------------------------------------------------------------------
.../src/common/hadoop/do-component-build | 2 +-
.../src/common/hadoop/init-hcfs.json | 95 ++++++
.../org/apache/bigtop/itest/junit/Ordered.java | 83 ++++++
.../bigtop/itest/junit/OrderedTest.groovy | 54 ++++
.../resources/clitest_data/testHDFSConf.xml | 294 +++++++++----------
bigtop.mk | 4 +-
build.gradle | 4 +-
7 files changed, 385 insertions(+), 151 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/826c9bc3/bigtop.mk
----------------------------------------------------------------------
diff --cc bigtop.mk
index aa8bf9e,321d60a..8bb0ae0
--- a/bigtop.mk
+++ b/bigtop.mk
@@@ -15,75 -15,19 +15,75 @@@
BIGTOP_VERSION=0.8.0
-# Hadoop 0.20.0-based hadoop package
+# WDD release RPM
+WDD_NAME=wdd-release
+WDD_RELNOTES_NAME=WDD release
+WDD_BASE_VERSION=4
+WDD_PKG_VERSION=4+WANdisco
+WDD_RELEASE_VERSION=1
+WDD_TARBALL_DST=RPM-GPG-KEY-WANdisco
+WDD_TARBALL_SRC=RPM-GPG-KEY-WANdisco
+WDD_DOWNLOAD_PATH=/
+WDD_SITE=$(WANDISCO_ARCHIVE)$(WDD_DOWNLOAD_PATH)
+WDD_ARCHIVE=$(WDD_SITE)
+$(eval $(call PACKAGE,wdd-release,WDD))
+
+# Hadoop 2.0.0-based hadoop package
HADOOP_NAME=hadoop
HADOOP_RELNOTES_NAME=Apache Hadoop
- HADOOP_BASE_VERSION=2.0.6.15-wdd3.8-SNAPSHOT
- HADOOP_PKG_VERSION=2.0.6.15+WANdisco
+ HADOOP_BASE_VERSION=2.3.0
+ HADOOP_PKG_VERSION=2.3.0
HADOOP_RELEASE_VERSION=1
HADOOP_TARBALL_DST=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION).tar.gz
-HADOOP_TARBALL_SRC=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)-src.tar.gz
-HADOOP_DOWNLOAD_PATH=/hadoop/common/$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)
-HADOOP_SITE=$(APACHE_MIRROR)$(HADOOP_DOWNLOAD_PATH)
-HADOOP_ARCHIVE=$(APACHE_ARCHIVE)$(HADOOP_DOWNLOAD_PATH)
+HADOOP_TARBALL_SRC=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)-src.tar.gz
+HADOOP_DOWNLOAD_PATH=/hadoop/core/${HADOOP_NAME}-${HADOOP_BASE_VERSION}
+HADOOP_SITE=$(WANDISCO_ARCHIVE)$(HADOOP_DOWNLOAD_PATH)
+HADOOP_ARCHIVE=$(HADOOP_SITE)
$(eval $(call PACKAGE,hadoop,HADOOP))
+# S3HDFS-Bridge
+HDFSB_NAME=wdd-s3hdfs
+HDFSB_RELNOTES_NAME=WANdisco S3HDFS Bridge
+HDFSB_BASE_VERSION=3.6.0
+HDFSB_PKG_VERSION=3.6.0+WANdisco
+HDFSB_RELEASE_VERSION=1
+HDFSB_TARBALL_DST=s3hdfs-$(HDFSB_BASE_VERSION).tar.gz
+HDFSB_TARBALL_SRC=$(HDFSB_TARBALL_DST)
+HDFSB_DOWNLOAD_PATH=/S3HDFS/
+HDFSB_SITE=$(WANDISCO_IP)${HDFSB_DOWNLOAD_PATH}
+HDFSB_ARCHIVE=$(HDFSB_SITE)
+$(eval $(call PACKAGE,wdd-s3hdfs,HDFSB))
+
+# consensus name-node
+## DOWNLOAD_URL is comprised from _SITE + _TARBALL_SRC
+NONSTOP_NAME=wdd-namenode-nonstop
+NONSTOP_RELNOTES_NAME=WANdisco Non-Stop Namenode
+## simply use make -e NONSTOP_BASE_VERSION=... to override
+NONSTOP_BASE_VERSION=1.7-SNAPSHOT
+# Make sure that something like -SNAPSHOT isn't present
+NONSTOP_PKG_VERSION=`echo $(NONSTOP_BASE_VERSION) | sed -e "s/-SNAPSHOT//" -e "s/-/+/"`+WANdisco
+NONSTOP_RELEASE_VERSION=1
+NONSTOP_TARBALL_DST=namenode-$(NONSTOP_BASE_VERSION).tar.gz
+NONSTOP_TARBALL_SRC=namenode-$(NONSTOP_BASE_VERSION)-src.tar.gz
+NONSTOP_DOWNLOAD_PATH=/NsNN/
+NONSTOP_SITE=$(WANDISCO_IP)${NONSTOP_DOWNLOAD_PATH}
+NONSTOP_ARCHIVE=$(NONSTOP_SITE)
+$(eval $(call PACKAGE,wdd-namenode-nonstop,NONSTOP))
+
+# Hippo: WDD UI project
+HIPPO_NAME=hippo
+HIPPO_RELNOTES_NAME=Hippo UI
+HIPPO_PKG_NAME=hippo
+HIPPO_BASE_VERSION=1.2-SNAPSHOT
+HIPPO_PKG_VERSION=1.2+WANdisco
+HIPPO_RELEASE_VERSION=1
+HIPPO_TARBALL_SRC=hadoop-ui-$(HIPPO_BASE_VERSION)-src.tar.gz
+HIPPO_TARBALL_DST=hippo-$(HIPPO_BASE_VERSION).tar.gz
+HIPPO_DOWNLOAD_PATH=/HadoopUI/
+HIPPO_SITE=$(WANDISCO_IP)$(HIPPO_DOWNLOAD_PATH)
+HIPPO_ARCHIVE=$(HIPPO_SITE)
+$(eval $(call PACKAGE,hippo,HIPPO))
+
# ZooKeeper
ZOOKEEPER_NAME=zookeeper
ZOOKEEPER_RELNOTES_NAME=Apache Zookeeper