Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec?rev=1195290&r1=1195289&r2=1195290&view=diff ============================================================================== --- incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec (original) +++ incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec Mon Oct 31 00:30:01 2011 @@ -12,16 +12,17 @@ # 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 doc_sqoop %{_docdir}/sqoop-%{sqoop_version} %define lib_sqoop /usr/lib/sqoop %if %{?suse_version:1}0 +%define doc_sqoop %{_docdir}/sqoop %global initd_dir %{_sysconfdir}/rc.d %else +%define doc_sqoop %{_docdir}/sqoop-%{sqoop_version} %global initd_dir %{_sysconfdir}/rc.d/init.d %endif @@ -31,7 +32,7 @@ Name: sqoop Version: %{sqoop_version} Release: %{sqoop_release} Summary: Sqoop allows easy imports and exports of data sets between databases and the Hadoop Distributed File System (HDFS). -URL: http://www.cloudera.com +URL: http://incubator.apache.org/sqoop/ Group: Development/Libraries Buildroot: %{_topdir}/INSTALL/%{name}-%{version} License: APL2 @@ -42,15 +43,15 @@ Source3: sqoop-metastore.sh Source4: sqoop-metastore.sh.suse Patch0: patch Buildarch: noarch -BuildRequires: asciidoc, xmlto -Prereq: hadoop +BuildRequires: asciidoc, xmlto +Requires: hadoop, bigtop-utils %description Sqoop allows easy imports and exports of data sets between databases and the Hadoop Distributed File System (HDFS). %package metastore Summary: Shared metadata repository for Sqoop. -URL: http://www.cloudera.com +URL: http://incubator.apache.org/sqoop/ Group: System/Daemons Provides: sqoop-metastore Requires: sqoop = %{version}-%{release} @@ -58,7 +59,16 @@ Requires: sqoop = %{version}-%{release} %if %{?suse_version:1}0 # Required for init scripts Requires: insserv -%else +%endif + +%if 0%{?mgaversion} +# Required for init scripts +Requires: initscripts +%endif + +# CentOS 5 does not have any dist macro +# So I will suppose anything that is not Mageia or a SUSE will be a RHEL/CentOS/Fedora +%if %{!?suse_version:1}0 && %{!?mgaversion:1}0 # Required for init scripts Requires: redhat-lsb %endif
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec?rev=1195290&r1=1195289&r2=1195290&view=diff ============================================================================== --- incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec (original) +++ incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec Mon Oct 31 00:30:01 2011 @@ -15,6 +15,12 @@ %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} @@ -31,6 +37,7 @@ Source0: %{name}-%{whirr_base_version}-i Source1: do-component-build Source2: install_%{name}.sh Source3: whirr.1 +Requires: bigtop-utils %description Whirr provides @@ -52,13 +59,14 @@ bash %{SOURCE1} %install %__rm -rf $RPM_BUILD_ROOT cp $RPM_SOURCE_DIR/whirr.1 . -sh %{SOURCE2} \ - --build-dir=. \ +bash %{SOURCE2} \ + --build-dir=build \ + --doc-dir=$RPM_BUILD_ROOT%{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.gz -%ghost %{lib_whirr}/cli/whirr.log +%doc %attr(0644,root,root) %{man_dir}/man1/whirr.1.* +%doc %{doc_whirr} Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec?rev=1195290&r1=1195289&r2=1195290&view=diff ============================================================================== --- incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec (original) +++ incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec Mon Oct 31 00:30:01 2011 @@ -14,7 +14,6 @@ # limitations under the License. %define etc_zookeeper /etc/zookeeper %define bin_zookeeper %{_bindir} -%define doc_zookeeper %{_docdir}/zookeeper-%{zookeeper_version} %define lib_zookeeper /usr/lib/zookeeper %define log_zookeeper /var/log/zookeeper %define run_zookeeper /var/run/zookeeper @@ -38,6 +37,7 @@ %{nil} +%define doc_zookeeper %{_docdir}/zookeeper %define alternatives_cmd update-alternatives %define alternatives_dep update-alternatives %define chkconfig_dep aaa_base @@ -46,6 +46,7 @@ %else +%define doc_zookeeper %{_docdir}/zookeeper-%{zookeeper_version} %define alternatives_cmd alternatives %define alternatives_dep chkconfig %define chkconfig_dep chkconfig @@ -70,11 +71,13 @@ Source2: install_zookeeper.sh Source3: hadoop-zookeeper.sh Source4: hadoop-zookeeper.sh.suse Source5: zookeeper.1 +Source6: zoo.cfg BuildArch: noarch -BuildRequires: ant, autoconf, automake, subversion -Requires(pre): coreutils, shadow-utils +BuildRequires: ant, autoconf, automake +Requires(pre): coreutils, shadow-utils, /usr/sbin/groupadd, /usr/sbin/useradd Requires(post): %{alternatives_dep} Requires(preun): %{alternatives_dep} +Requires: bigtop-utils %description ZooKeeper is a centralized service for maintaining configuration information, @@ -98,11 +101,21 @@ BuildArch: noarch %if %{?suse_version:1}0 # Required for init scripts Requires: insserv -%else +%endif + +%if 0%{?mgaversion} +# Required for init scripts +Requires: initscripts +%endif + +# CentOS 5 does not have any dist macro +# So I will suppose anything that is not Mageia or a SUSE will be a RHEL/CentOS/Fedora +%if %{!?suse_version:1}0 && %{!?mgaversion:1}0 # Required for init scripts Requires: redhat-lsb %endif + %description server This package starts the zookeeper server on startup @@ -114,7 +127,7 @@ bash %{SOURCE1} -Dversion=%{version} %install %__rm -rf $RPM_BUILD_ROOT -cp $RPM_SOURCE_DIR/zookeeper.1 . +cp $RPM_SOURCE_DIR/zookeeper.1 $RPM_SOURCE_DIR/zoo.cfg . sh %{SOURCE2} \ --build-dir=. \ --doc-dir=%{doc_zookeeper} \ Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/PackageManager.groovy URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/PackageManager.groovy?rev=1195290&r1=1195289&r2=1195290&view=diff ============================================================================== --- incubator/bigtop/branches/hadoop-0.22/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/PackageManager.groovy (original) +++ incubator/bigtop/branches/hadoop-0.22/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/PackageManager.groovy Mon Oct 31 00:30:01 2011 @@ -213,6 +213,8 @@ public abstract class PackageManager { return new YumCmdLinePackageManager(); case ~/(?is).*(suse|sles|sled).*/: return new ZypperCmdLinePackageManager(); + case ~/(?is).*(mageia).*/: + return new UrpmiCmdLinePackageManager(); default: return null; } Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/RPMPackage.groovy URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/RPMPackage.groovy?rev=1195290&r1=1195289&r2=1195290&view=diff ============================================================================== --- incubator/bigtop/branches/hadoop-0.22/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/RPMPackage.groovy (original) +++ incubator/bigtop/branches/hadoop-0.22/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/RPMPackage.groovy Mon Oct 31 00:30:01 2011 @@ -44,7 +44,7 @@ class RPMPackage extends ManagedPackage if (curMetaKey == "description" || ((it =~ /^\s+: /).find() && curMetaKey == "summary")) { pkg.meta[curMetaKey] <<= "\n${it.replaceAll(/^\s+:/,'')}"; } else { - def m = (it =~ /(\S+) *: *(.+)/); + def m = (it =~ /(\S+)\s*:\s*(.*)/); if (m.size()) { String[] matcher = m[0]; if ("Name" == matcher[1] && !givenPkg) { Added: incubator/bigtop/branches/hadoop-0.22/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/UrpmiCmdLinePackageManager.groovy URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/UrpmiCmdLinePackageManager.groovy?rev=1195290&view=auto ============================================================================== --- incubator/bigtop/branches/hadoop-0.22/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/UrpmiCmdLinePackageManager.groovy (added) +++ incubator/bigtop/branches/hadoop-0.22/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/UrpmiCmdLinePackageManager.groovy Mon Oct 31 00:30:01 2011 @@ -0,0 +1,76 @@ +/** + * 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 + * <p/> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p/> + * 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. + */ + +package org.apache.bigtop.itest.pmanager + +import org.apache.bigtop.itest.posix.Service + +class UrpmiCmdLinePackageManager extends PackageManager { + static String type = "urpmi"; + + public void setDefaults(String defaults) {} + + public int addBinRepo(String record, String url, String key, String cookie) { + shRoot.exec("urpmi.addmedia '${record}' $url"); + return shRoot.getRet(); + } + + public int removeBinRepo(String record) { + shRoot.exec("urpmi.removemedia -q '${record}'"); + return shRoot.getRet(); + } + + public int refresh() { + shRoot.exec("urpmi.update -a"); + return shRoot.getRet(); + } + + public int cleanup() { + shRoot.exec("urpmi --clean"); + return shRoot.getRet(); + } + + public List<PackageInstance> search(String name) { + def packages = new ArrayList<PackageInstance>(); + shUser.exec("urpmq ${name} | sed -e 's/|/\\n/g' | uniq").out.each { + packages.add(PackageInstance.getPackageInstance (this, it)) + } + return packages + } + + public List<PackageInstance> lookup(String name) { + shUser.exec("urpmq -i $name | sed -re \"s/(Size\\s+:\\s[0-9]+)\\s+/\\1\\n/\" "); + return (shUser.getRet() == 0) ? RPMPackage.parseMetaOutput(null, shUser.out, this) : []; + } + + public int install(PackageInstance pkg) { + shRoot.exec("urpmi --verbose --force --auto ${pkg.name}"); + pkg.installMessages = shRoot.getOut().join('\n'); + return shRoot.getRet(); + } + + public int remove(PackageInstance pkg) { + shRoot.exec("urpme --verbose --force --auto ${pkg.name}"); + return shRoot.getRet(); + } + + public boolean isInstalled(PackageInstance pkg) { + shUser.exec("rpm -q ${pkg.name}") + return (shUser.getRet() == 0) + } +} Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/flume/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/flume/pom.xml?rev=1195290&r1=1195289&r2=1195290&view=diff ============================================================================== --- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/flume/pom.xml (original) +++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/flume/pom.xml Mon Oct 31 00:30:01 2011 @@ -34,7 +34,6 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>0.22.0-SNAPSHOT</version> </dependency> </dependencies> </project> Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hadoop/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hadoop/pom.xml?rev=1195290&r1=1195289&r2=1195290&view=diff ============================================================================== --- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hadoop/pom.xml (original) +++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hadoop/pom.xml Mon Oct 31 00:30:01 2011 @@ -34,17 +34,14 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>0.22.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common-test</artifactId> - <version>0.22.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs-test</artifactId> - <version>0.22.0-SNAPSHOT</version> </dependency> </dependencies> Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hbase/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hbase/pom.xml?rev=1195290&r1=1195289&r2=1195290&view=diff ============================================================================== --- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hbase/pom.xml (original) +++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hbase/pom.xml Mon Oct 31 00:30:01 2011 @@ -34,35 +34,19 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapred</artifactId> - <version>0.22.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> - <version>0.22.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase</artifactId> - <version>0.92.0-SNAPSHOT</version> - <exclusions> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase</artifactId> - <version>0.92.0-SNAPSHOT</version> <type>test-jar</type> - <exclusions> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> </project> Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/oozie/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/oozie/pom.xml?rev=1195290&r1=1195289&r2=1195290&view=diff ============================================================================== --- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/oozie/pom.xml (original) +++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/oozie/pom.xml Mon Oct 31 00:30:01 2011 @@ -34,7 +34,6 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>0.22.0-SNAPSHOT</version> </dependency> </dependencies> </project>
