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 2015/01/06 01:20:46 UTC
[6/6] bigtop git commit: BIGTOP-1571. Remove Whirr from the BOM
BIGTOP-1571. Remove Whirr from the BOM
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/14a98579
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/14a98579
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/14a98579
Branch: refs/heads/master
Commit: 14a98579e3baf6a481f261a6db64e5ff3a625cd3
Parents: 5e0d9f1
Author: Dasha Boudnik <da...@wandisco.com>
Authored: Mon Jan 5 16:36:48 2015 -0800
Committer: Konstantin Boudnik <co...@apache.org>
Committed: Mon Jan 5 16:19:18 2015 -0800
----------------------------------------------------------------------
bigtop-deploy/live-cd/apache-bigtop.ks | 1 -
.../src/common/whirr/do-component-build | 24 -
.../src/common/whirr/install_whirr.sh | 126 --
bigtop-packages/src/common/whirr/whirr.1 | 88 --
bigtop-packages/src/deb/whirr/changelog | 1 -
bigtop-packages/src/deb/whirr/compat | 1 -
bigtop-packages/src/deb/whirr/control | 34 -
bigtop-packages/src/deb/whirr/copyright | 15 -
bigtop-packages/src/deb/whirr/rules | 45 -
bigtop-packages/src/deb/whirr/source/format | 1 -
bigtop-packages/src/rpm/whirr/BUILD/.gitignore | 0
bigtop-packages/src/rpm/whirr/RPMS/.gitignore | 0
.../src/rpm/whirr/SOURCES/.gitignore | 0
bigtop-packages/src/rpm/whirr/SPECS/whirr.spec | 72 -
bigtop-packages/src/rpm/whirr/SRPMS/.gitignore | 0
.../bigtop/itest/packagesmoke/DeployCDH.groovy | 2 +-
.../package/src/main/resources/package_data.xml | 18 -
.../src/main/resources/urpmi/package_data.xml | 684 ----------
.../src/main/resources/yum/package_data.xml | 8 -
.../src/main/resources/zypper/package_data.xml | 8 -
.../package/src/main/resources/zypper/whirr.xml | 1267 ------------------
bigtop.mk | 14 -
22 files changed, 1 insertion(+), 2408 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/14a98579/bigtop-deploy/live-cd/apache-bigtop.ks
----------------------------------------------------------------------
diff --git a/bigtop-deploy/live-cd/apache-bigtop.ks b/bigtop-deploy/live-cd/apache-bigtop.ks
index be16ebc..2c51eb2 100644
--- a/bigtop-deploy/live-cd/apache-bigtop.ks
+++ b/bigtop-deploy/live-cd/apache-bigtop.ks
@@ -84,7 +84,6 @@ mahout
pig
oozie
oozie-client
-whirr
zookeeper
zookeeper-server
%end
http://git-wip-us.apache.org/repos/asf/bigtop/blob/14a98579/bigtop-packages/src/common/whirr/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/whirr/do-component-build b/bigtop-packages/src/common/whirr/do-component-build
deleted file mode 100644
index 26f09fd..0000000
--- a/bigtop-packages/src/common/whirr/do-component-build
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -ex
-
-export MAVEN_OPT="-XX:MaxPermSize=512m"
-mvn -Pjavadoc -DskipTests clean install -DskipTests "$@"
-mvn -Pjavadoc site source:jar package assembly:assembly -DskipTests "$@"
-
-mkdir build
-tar -C build --strip-components=1 -xzf target/*.tar.gz
http://git-wip-us.apache.org/repos/asf/bigtop/blob/14a98579/bigtop-packages/src/common/whirr/install_whirr.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/whirr/install_whirr.sh b/bigtop-packages/src/common/whirr/install_whirr.sh
deleted file mode 100644
index 21f9301..0000000
--- a/bigtop-packages/src/common/whirr/install_whirr.sh
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -e
-
-usage() {
- echo "
-usage: $0 <options>
- Required not-so-options:
- --build-dir=DIR path to Whirr dist.dir
- --prefix=PREFIX path to install into
-
- Optional options:
- --doc-dir=DIR path to install docs into [/usr/share/doc/whirr]
- --lib-dir=DIR path to install Whirr home [/usr/lib/whirr]
- --installed-lib-dir=DIR path where lib-dir will end up on target system
- --bin-dir=DIR path to install bins [/usr/bin]
- ... [ see source for more similar options ]
- "
- exit 1
-}
-
-OPTS=$(getopt \
- -n $0 \
- -o '' \
- -l 'prefix:' \
- -l 'doc-dir:' \
- -l 'lib-dir:' \
- -l 'installed-lib-dir:' \
- -l 'bin-dir:' \
- -l 'build-dir:' -- "$@")
-
-if [ $? != 0 ] ; then
- usage
-fi
-
-eval set -- "$OPTS"
-while true ; do
- case "$1" in
- --prefix)
- PREFIX=$2 ; shift 2
- ;;
- --build-dir)
- BUILD_DIR=$2 ; shift 2
- ;;
- --doc-dir)
- DOC_DIR=$2 ; shift 2
- ;;
- --lib-dir)
- LIB_DIR=$2 ; shift 2
- ;;
- --installed-lib-dir)
- INSTALLED_LIB_DIR=$2 ; shift 2
- ;;
- --bin-dir)
- BIN_DIR=$2 ; shift 2
- ;;
- --)
- shift ; break
- ;;
- *)
- echo "Unknown option: $1"
- usage
- exit 1
- ;;
- esac
-done
-
-for var in PREFIX BUILD_DIR ; do
- if [ -z "$(eval "echo \$$var")" ]; then
- echo Missing param: $var
- usage
- fi
-done
-
-MAN_DIR=/usr/share/man/man1
-DOC_DIR=${DOC_DIR:-/usr/share/doc/whirr}
-LIB_DIR=${LIB_DIR:-/usr/lib/whirr}
-INSTALLED_LIB_DIR=${INSTALLED_LIB_DIR:-/usr/lib/whirr}
-BIN_DIR=${BIN_DIR:-/usr/bin}
-
-# First we'll move everything into lib
-install -d -m 0755 $PREFIX/$LIB_DIR
-(cd $BUILD_DIR && tar -cf - .) | (cd $PREFIX/$LIB_DIR && tar -xf -)
-
-# Copy in the /usr/bin/whirr wrapper
-install -d -m 0755 $PREFIX/$BIN_DIR
-cat > $PREFIX/$BIN_DIR/whirr <<EOF
-#!/bin/bash
-
-# Autodetect JAVA_HOME if not defined
-. /usr/lib/bigtop-utils/bigtop-detect-javahome
-
-exec $INSTALLED_LIB_DIR/bin/whirr "\$@"
-EOF
-chmod 755 $PREFIX/$BIN_DIR/whirr
-
-install -d -m 0755 $PREFIX/$MAN_DIR
-gzip -c whirr.1 > $PREFIX/$MAN_DIR/whirr.1.gz
-
-# Move the docs, but leave a symlink in place for compat. reasons
-install -d -m 0755 $PREFIX/$DOC_DIR
-mv $PREFIX/$LIB_DIR/docs/* $PREFIX/$DOC_DIR
-mv $PREFIX/$LIB_DIR/{NOTICE.txt,LICENSE.txt,BUILD.txt,CHANGES.txt,doap_Whirr.rdf,README.txt} $PREFIX/$DOC_DIR
-rmdir $PREFIX/$LIB_DIR/docs
-ln -s /${DOC_DIR/#$PREFIX/} $PREFIX/$LIB_DIR/docs
-
-# Remove some bits which sould not be shipped.
-for dir in src services pom.xml patch-stamp examples debian core cli build-tools bigtop-empty
-do
- rm -rf $PREFIX/$LIB_DIR/$dir
-done
http://git-wip-us.apache.org/repos/asf/bigtop/blob/14a98579/bigtop-packages/src/common/whirr/whirr.1
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/whirr/whirr.1 b/bigtop-packages/src/common/whirr/whirr.1
deleted file mode 100644
index 835c57e..0000000
--- a/bigtop-packages/src/common/whirr/whirr.1
+++ /dev/null
@@ -1,88 +0,0 @@
-.\" Licensed to the Apache Software Foundation (ASF) under one or more
-.\" contributor license agreements. See the NOTICE file distributed with
-.\" this work for additional information regarding copyright ownership.
-.\" The ASF licenses this file to You under the Apache License, Version 2.0
-.\" (the "License"); you may not use this file except in compliance with
-.\" the License. You may obtain a copy of the License at
-.\"
-.\" http://www.apache.org/licenses/LICENSE-2.0
-.\"
-.\" Unless required by applicable law or agreed to in writing, software
-.\" distributed under the License is distributed on an "AS IS" BASIS,
-.\" WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-.\" See the License for the specific language governing permissions and
-.\" limitations under the License.
-.\"
-.\" Process this file with
-.\" groff -man -Tascii whirr.1
-.\"
-.TH whirr 1 "November 2010 " Linux "User Manuals"
-
-.SH NAME
-\fBwhirr\fR \- run software services on cloud infrastructure
-
-.SH SYNOPSIS
-
-.B whirr
-COMMAND [OPTIONS]
-
-.SH DESCRIPTION
-
-Apache Whirr runs services in the cloud. You don't have to worry about the
-idiosyncrasies of each provider.
-
-For more information about Whirr, see
-http://incubator.apache.org/whirr/.
-
-.SH COMMANDS
-
-.IP "version"
-Print the version number and exit.
-.IP "launch-cluster"
-Launch a new cluster running a service.
-.IP "destroy-cluster"
-Terminate and cleanup resources for a running cluster.
-.IP "list-cluster"
-List the nodes in a cluster.
-
-.SH OPTIONS
-
-.IP "--client-cidrs"
-A comma-separated list of CIDR (http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing)
-blocks. E.g. '208.128.0.0/11,108.128.0.0/11'.
-.IP "--cluster-name"
-The name of the cluster to operate on. E.g. 'hadoopcluster'. The cluster name is
-used to tag the instances in some cloud-specific way. For example, in Amazon it
-is used to form the security group name.
-.IP "--config"
-A filename of a properties file containing option properties. Note that Whirr
-properties specified in this file all have a 'whirr.' prefix.
-.IP "--credential"
-The (secret) cloud credential for your account.
-.IP "--hardware-id"
-The type of hardware to use for the instance. This must be compatible with the image ID.
-.IP "--identity"
-The cloud identity (username) for you account.
-.IP "--image-id"
-The ID of the image to use for instances. If not specified then a vanilla Linux image is chosen.
-.IP "--instance-templates"
-The number of instances to launch for each set of roles. E.g. '1 nn+jt,10 dn+tt'
-means one instance with the roles 'nn' (namenode) and 'jt' (jobtracker), and ten
-instances each with the roles 'dn' (datanode) and 'tt' (tasktracker).
-.IP "--location-id"
-The location to launch instances in. If not specified then an arbitrary location will be chosen.
-.IP "--private-key-file"
-The filename of the private key used to connect to instances. Defaults to '~/.ssh/id_rsa'.
-.IP "--provider"
-The name of the cloud provider. Defaults to 'ec2'.
-.IP "--public-key-file"
-The filename of the public key used to connect to instances. Defaults to '~/.ssh/id_rsa.pub'.
-.IP "--run-url-base"
-The base URL for forming run urls from. Change this to host your own set of
-launch scripts, as explained at http://incubator.apache.org/whirr/faq.html.
-.IP "--service-name"
-The name of the service to use. E.g. 'hadoop'. A list of available services is
-printed when the command is run with no arguments.
-
-.SH COPYRIGHT
-Copyright (C) 2010 The Apache Software Foundation. All rights reserved.
http://git-wip-us.apache.org/repos/asf/bigtop/blob/14a98579/bigtop-packages/src/deb/whirr/changelog
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/whirr/changelog b/bigtop-packages/src/deb/whirr/changelog
deleted file mode 100644
index 547ed02..0000000
--- a/bigtop-packages/src/deb/whirr/changelog
+++ /dev/null
@@ -1 +0,0 @@
---- This is auto-generated
http://git-wip-us.apache.org/repos/asf/bigtop/blob/14a98579/bigtop-packages/src/deb/whirr/compat
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/whirr/compat b/bigtop-packages/src/deb/whirr/compat
deleted file mode 100644
index 7f8f011..0000000
--- a/bigtop-packages/src/deb/whirr/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
http://git-wip-us.apache.org/repos/asf/bigtop/blob/14a98579/bigtop-packages/src/deb/whirr/control
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/whirr/control b/bigtop-packages/src/deb/whirr/control
deleted file mode 100644
index 17e23c1..0000000
--- a/bigtop-packages/src/deb/whirr/control
+++ /dev/null
@@ -1,34 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-Source: whirr
-Section: misc
-Priority: extra
-Maintainer: Bigtop <de...@bigtop.apache.org>
-Build-Depends: debhelper (>= 7.0.50~)
-Standards-Version: 3.8.0
-Homepage: http://whirr.apache.org/
-
-Package: whirr
-Architecture: all
-Depends: bigtop-utils (>= 0.7)
-Description: Scripts and libraries for running software services on cloud infrastructure.
- Whirr provides
- .
- * A cloud-neutral way to run services. You don't have to worry about the
- idiosyncrasies of each provider.
- * A common service API. The details of provisioning are particular to the
- service.
- * Smart defaults for services. You can get a properly configured system
- running quickly, while still being able to override settings as needed.
http://git-wip-us.apache.org/repos/asf/bigtop/blob/14a98579/bigtop-packages/src/deb/whirr/copyright
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/whirr/copyright b/bigtop-packages/src/deb/whirr/copyright
deleted file mode 100644
index 0821456..0000000
--- a/bigtop-packages/src/deb/whirr/copyright
+++ /dev/null
@@ -1,15 +0,0 @@
-Format: http://dep.debian.net/deps/dep5
-Source: http://incubator.apache.org/whirr/
-Upstream-Name: Apache Whirr
-
-Files: *
-Copyright: 2010-2011, The Apache Software Foundation
-License: Apache-2.0
-
-Files debian/*
-Copyright: 2011, The Apache Software Foundation
-License: Apache-2.0
-
-License: Apache-2.0
- On Debian systems, the complete text of the Apache 2.0 license
- can be found in "/usr/share/common-licenses/Apache-2.0".
http://git-wip-us.apache.org/repos/asf/bigtop/blob/14a98579/bigtop-packages/src/deb/whirr/rules
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/whirr/rules b/bigtop-packages/src/deb/whirr/rules
deleted file mode 100755
index 6c64ee0..0000000
--- a/bigtop-packages/src/deb/whirr/rules
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/make -f
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-%:
- dh $@
-
-override_dh_auto_build:
- # No easy way to disable the default RAT run which fails the build because of some fails in the debian/ directory
- rm -rf bigtop-empty
- mkdir -p bigtop-empty
- # Bruno could not find a way to add debian/ to RAT exclude list through cmd line
- # or to unbind rat:check goal
- # So he was redirecting its attention with a decoy
- bash debian/do-component-build -Drat.basedir=$${PWD}/bigtop-empty -Dmaven.repo.local=${HOME}/.m2/repository
- mkdir -p debian/tmp
- # NOTE: FIXME me right away
- cp -r debian/whirr.1 .
-
-override_dh_auto_install:
- bash -x debian/install_whirr.sh \
- --build-dir=build \
- --doc-dir=/usr/share/doc/whirr \
- --prefix=debian/whirr
http://git-wip-us.apache.org/repos/asf/bigtop/blob/14a98579/bigtop-packages/src/deb/whirr/source/format
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/whirr/source/format b/bigtop-packages/src/deb/whirr/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/bigtop-packages/src/deb/whirr/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
http://git-wip-us.apache.org/repos/asf/bigtop/blob/14a98579/bigtop-packages/src/rpm/whirr/BUILD/.gitignore
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/whirr/BUILD/.gitignore b/bigtop-packages/src/rpm/whirr/BUILD/.gitignore
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/bigtop/blob/14a98579/bigtop-packages/src/rpm/whirr/RPMS/.gitignore
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/whirr/RPMS/.gitignore b/bigtop-packages/src/rpm/whirr/RPMS/.gitignore
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/bigtop/blob/14a98579/bigtop-packages/src/rpm/whirr/SOURCES/.gitignore
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/whirr/SOURCES/.gitignore b/bigtop-packages/src/rpm/whirr/SOURCES/.gitignore
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/bigtop/blob/14a98579/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec b/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec
deleted file mode 100644
index e336680..0000000
--- a/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec
+++ /dev/null
@@ -1,72 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-%define lib_whirr /usr/lib/whirr
-%define man_dir /usr/share/man
-
-%if %{?suse_version:1}0
- %define doc_whirr %{_docdir}/whirr
-%else
- %define doc_whirr %{_docdir}/whirr-%{whirr_version}
-%endif
-
-# disable repacking jars
-%define __os_install_post %{nil}
-
-Name: whirr
-Version: %{whirr_version}
-Release: %{whirr_release}
-Summary: Scripts and libraries for running software services on cloud infrastructure.
-URL: http://whirr.apache.org/
-Group: Development/Libraries
-BuildArch: noarch
-Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-License: ASL 2.0
-Source0: %{name}-%{whirr_base_version}-src.tar.gz
-Source1: do-component-build
-Source2: install_%{name}.sh
-Source3: whirr.1
-Requires: bigtop-utils >= 0.7
-
-%description
-Whirr provides
-
-* A cloud-neutral way to run services. You don't have to worry about the
- idiosyncrasies of each provider.
-* A common service API. The details of provisioning are particular to the
- service.
-* Smart defaults for services. You can get a properly configured system
- running quickly, while still being able to override settings as needed.
-
-
-%prep
-%setup -n %{name}-%{whirr_base_version}-src
-
-%build
-bash %{SOURCE1}
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-cp $RPM_SOURCE_DIR/whirr.1 .
-bash %{SOURCE2} \
- --build-dir=build \
- --doc-dir=%{doc_whirr} \
- --prefix=$RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-%attr(0755,root,root) %{lib_whirr}
-%attr(0755,root,root) %{_bindir}/%{name}
-%doc %attr(0644,root,root) %{man_dir}/man1/whirr.1.*
-%doc %{doc_whirr}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/14a98579/bigtop-packages/src/rpm/whirr/SRPMS/.gitignore
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/whirr/SRPMS/.gitignore b/bigtop-packages/src/rpm/whirr/SRPMS/.gitignore
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/bigtop/blob/14a98579/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/DeployCDH.groovy
----------------------------------------------------------------------
diff --git a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/DeployCDH.groovy b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/DeployCDH.groovy
index 203a4f6..b885f9b 100644
--- a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/DeployCDH.groovy
+++ b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/DeployCDH.groovy
@@ -49,7 +49,7 @@ class DeployCDH {
"hadoop-hbase-master", "hadoop-hbase-regionserver", "hadoop-hbase-thrift", "hadoop-hive", "hadoop-pig",
"hadoop-zookeeper", "hadoop-zookeeper-server", "hue", "hue-about", "hue-beeswax", "hue-common",
"hue-filebrowser", "hue-help", "hue-jobbrowser", "hue-jobsub", "hue-plugins", "hue-proxy",
- "hue-useradmin", "oozie", "oozie-client", "sqoop", "sqoop-metastore", "whirr" ];
+ "hue-useradmin", "oozie", "oozie-client", "sqoop", "sqoop-metastore" ];
List<String> aptPkg = [ "hadoop-0.20-doc", "libhdfs0", "libhdfs0-dev", "python-hive" ];
List<String> yumPkg = [ "hadoop-0.20-debuginfo", "hadoop-0.20-libhdfs" ];
http://git-wip-us.apache.org/repos/asf/bigtop/blob/14a98579/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
----------------------------------------------------------------------
diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml b/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
index 7024c87..bc32bdd 100644
--- a/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
+++ b/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
@@ -154,24 +154,6 @@ Spark runs on top of the Apache Mesos cluster manager.</description>
<spark>/self</spark>
</deps>
</spark-python>
- <whirr>
- <metadata>
- <summary>Scripts and libraries for running software services on cloud infrastructure.</summary>
- <description>Whirr provides
- .
- * A cloud-neutral way to run services. You don't have to worry about the
- idiosyncrasies of each provider.
- * A common service API. The details of provisioning are particular to the
- service.
- * Smart defaults for services. You can get a properly configured system
- running quickly, while still being able to override settings as needed.
- </description>
- <url>http://whirr.apache.org/</url>
- </metadata>
- <deps>
- <bigtop-utils/>
- </deps>
- </whirr>
<flume>
<metadata>
<summary>Flume is a reliable, scalable, and manageable distributed log collection application for collecting data such as logs and delivering it to data stores such as Hadoop's HDFS.</summary>