Updated Branches: refs/heads/master 3ab42b86b -> bfcc351f3
BIGTOP-850. Remove non-ASF repositories and infrastructure references from the project files Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/0013eba3 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/0013eba3 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/0013eba3 Branch: refs/heads/master Commit: 0013eba3cfe1e42c8d345b38d632eb3d1ddf694a Parents: 3ab42b8 Author: Roman Shaposhnik <[email protected]> Authored: Sat May 11 16:42:00 2013 -0700 Committer: Roman Shaposhnik <[email protected]> Committed: Sat May 11 16:42:00 2013 -0700 ---------------------------------------------------------------------- Makefile | 1 - README | 6 +- .../modules/hadoop-hive/templates/hive-site.xml | 2 +- .../src/common/oozie/do-component-build | 12 +-- bigtop-packages/src/deb/pig/pig.preinst | 1 - bigtop-packages/src/rpm/hive/SPECS/hive.spec | 2 +- bigtop-packages/src/rpm/pig/SPECS/pig.spec | 2 +- .../hbase/system/TestConcurrentScanAndPut.java | 4 +- .../bigtop/itest/packagesmoke/BTServices.groovy | 114 +++++++++++++++ .../bigtop/itest/packagesmoke/CDHServices.groovy | 114 --------------- .../itest/packagesmoke/PackageTestCommon.groovy | 2 +- .../itest/packagesmoke/PackageTestRepoMgr.groovy | 50 +++--- .../itest/packagesmoke/TestPackagesBasics.groovy | 6 +- .../TestPackagesPseudoDistributed.groovy | 2 +- .../TestPackagesPseudoDistributedDependency.groovy | 2 +- ...estPackagesPseudoDistributedFileContents.groovy | 2 +- .../TestPackagesPseudoDistributedServices.groovy | 2 +- .../bigtop/itest/packagesmoke/TestServices.groovy | 8 +- .../packagesmoke/TestServicesCreateState.groovy | 4 +- .../TestServicesCreateStateMissing.groovy | 2 +- bigtop-tests/test-execution/package/pom.xml | 8 +- bigtop-tests/test-execution/smokes/datafu/pom.xml | 6 +- bigtop-tests/test-execution/smokes/sqoop/pom.xml | 2 +- src/site/xdoc/index.xml | 2 +- test/MANIFEST.txt | 13 -- test/NOTICE.txt | 3 - test/site/pom.xml | 6 +- test/site/src/site/apt/downloads.apt | 4 +- test/site/src/site/fml/faq.fml | 28 ++-- test/site/src/site/site.xml | 36 +++--- 30 files changed, 209 insertions(+), 237 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/Makefile ---------------------------------------------------------------------- diff --git a/Makefile b/Makefile index face805..9504dab 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,6 @@ TARGETS_CLEAN:= # Default Apache mirror APACHE_MIRROR ?= http://apache.osuosl.org APACHE_ARCHIVE ?= http://archive.apache.org/dist -CLOUDERA_ARCHIVE ?= http://archive.cloudera.com/tarballs/ # Include the implicit rules and functions for building packages include package.mk http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/README ---------------------------------------------------------------------- diff --git a/README b/README index 32843d7..19e4102 100644 --- a/README +++ b/README @@ -82,8 +82,8 @@ WARNING: since testing packages requires installing them on a live system it is highly recommended to use VMs for that. Testing Bigtop is done using iTest framework. For more documentation -on iTest visit the iTest page -(http://cloudera.github.com/bigtop/iTest) but here's 2 steps to get started: +on iTest and testing visit Bigtop wiki http://bigtop.apache.org/, +but here's 2 steps to get started: * install package testing iTest artifacts locally: @@ -91,7 +91,7 @@ on iTest visit the iTest page * use those locally installed iTest package testing artifacts to run a suite: - cd test/suites/package/ && mvn clean verify -Dcdh.repo.file.url.CentOS=XXX -D'org.apache.maven-failsafe-plugin.testInclude=**/TestPackagesReadiness.*' + cd test/suites/package/ && mvn clean verify -Dbigtop.repo.file.url.CentOS=XXX -D'org.apache.maven-failsafe-plugin.testInclude=**/TestPackagesReadiness.*' ## Contact us! http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/bigtop-deploy/puppet/modules/hadoop-hive/templates/hive-site.xml ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/hadoop-hive/templates/hive-site.xml b/bigtop-deploy/puppet/modules/hadoop-hive/templates/hive-site.xml index 19a9761..4f8cf89 100644 --- a/bigtop-deploy/puppet/modules/hadoop-hive/templates/hive-site.xml +++ b/bigtop-deploy/puppet/modules/hadoop-hive/templates/hive-site.xml @@ -56,7 +56,7 @@ <property> <name>hive.hwi.war.file</name> - <value>/usr/lib/hive/lib/hive-hwi-0.7.0-cdh3u1-SNAPSHOT.war</value> + <value>/usr/lib/hive/lib/hive-hwi.war</value> <description>This is the WAR file with the jsp content for Hive Web Interface</description> </property> http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/bigtop-packages/src/common/oozie/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/oozie/do-component-build b/bigtop-packages/src/common/oozie/do-component-build index 6c7bdc3..4446811 100755 --- a/bigtop-packages/src/common/oozie/do-component-build +++ b/bigtop-packages/src/common/oozie/do-component-build @@ -38,16 +38,6 @@ RELEASE_DIR=`cd ${RELEASE_DIR}/..;pwd` RELEASE_DIR=$PWD -# -# Resolve build version -# -RELEASE_ENV_FILENAME=release.env -RELEASE_ENV_FILE=${RELEASE_DIR}/cloudera/${RELEASE_ENV_FILENAME} -if [ -f "${RELEASE_ENV_FILE}" ]; then - echo "Setting release environment using ${RELEASE_ENV_FILE}" - . ${RELEASE_ENV_FILE} -fi - # IMPORTANT: THE FULL_VERSION, if set, will be used only for the final TARBALL, # Everything inside of the TARBALL uses the version specified in the POM if [ -z "${FULL_VERSION}" ]; then @@ -110,7 +100,7 @@ if [ "${MKDISTRO_RESULT}" != "0" ]; then fi # -# Expand Oozie TAR and create CDH Ooozie TAR +# Expand Oozie TAR and create Bigtop Ooozie TAR # # (TODO: This logic is kind of twisted, revisit.) # (TODO: Consider doing the source copy before the build if we can assume a clean checkout.) http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/bigtop-packages/src/deb/pig/pig.preinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/pig/pig.preinst b/bigtop-packages/src/deb/pig/pig.preinst index 931b740..89ace96 100644 --- a/bigtop-packages/src/deb/pig/pig.preinst +++ b/bigtop-packages/src/deb/pig/pig.preinst @@ -31,7 +31,6 @@ set -e case "$1" in install|upgrade) - # workaround for https://issues.cloudera.org/browse/DISTRO-223 if [ "$2" -a -d /usr/lib/pig/conf ]; then mv /usr/lib/pig/conf /usr/lib/pig/conf.old.`date +'%s'` || : fi http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/bigtop-packages/src/rpm/hive/SPECS/hive.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/hive/SPECS/hive.spec b/bigtop-packages/src/rpm/hive/SPECS/hive.spec index f700d89..69c7915 100644 --- a/bigtop-packages/src/rpm/hive/SPECS/hive.spec +++ b/bigtop-packages/src/rpm/hive/SPECS/hive.spec @@ -154,7 +154,7 @@ cp $RPM_SOURCE_DIR/hive-site.xml . # Workaround for BIGTOP-583 %__rm -f $RPM_BUILD_ROOT/%{usr_lib_hive}/lib/slf4j-log4j12-*.jar -# We need to get rid of jars that happen to be shipped in other CDH packages +# We need to get rid of jars that happen to be shipped in other Bigtop packages %__rm -f $RPM_BUILD_ROOT/%{usr_lib_hive}/lib/hbase-*.jar $RPM_BUILD_ROOT/%{usr_lib_hive}/lib/zookeeper-*.jar %__ln_s /usr/lib/hbase/hbase.jar /usr/lib/zookeeper/zookeeper.jar $RPM_BUILD_ROOT/%{usr_lib_hive}/lib/ http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/bigtop-packages/src/rpm/pig/SPECS/pig.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/pig/SPECS/pig.spec b/bigtop-packages/src/rpm/pig/SPECS/pig.spec index 363bcce..1e5b8f7 100644 --- a/bigtop-packages/src/rpm/pig/SPECS/pig.spec +++ b/bigtop-packages/src/rpm/pig/SPECS/pig.spec @@ -129,7 +129,7 @@ sh -x %{SOURCE2} \ --prefix=$RPM_BUILD_ROOT %pre -# workaround for https://issues.cloudera.org/browse/DISTRO-223 +# workaround for old style Pig conf dir if [ $1 -gt 1 -a -d %{lib_pig}/conf ]; then %__mv %{lib_pig}/conf %{lib_pig}/conf.old.`date +'%s'` || : fi http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/hbase/system/TestConcurrentScanAndPut.java ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/hbase/system/TestConcurrentScanAndPut.java b/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/hbase/system/TestConcurrentScanAndPut.java index 0b1414d..fec28be 100644 --- a/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/hbase/system/TestConcurrentScanAndPut.java +++ b/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/hbase/system/TestConcurrentScanAndPut.java @@ -147,7 +147,7 @@ public class TestConcurrentScanAndPut { String tableNameStr = Bytes.toString(tableName); System.out.println("Starting puts to test table " + tableNameStr); putSh.exec("(HBASE_CLASSPATH=. " + - "hbase com.cloudera.itest.hbase.system.Putter " + + "hbase org.apache.bigtop.itest.hbase.system.Putter " + tableNameStr + " 13 -l " + putterLoops + " > /dev/null 2>&1 & echo $! ) 2> /dev/null"); putter_pid = putSh.getOut().get(0); @@ -155,7 +155,7 @@ public class TestConcurrentScanAndPut { System.out.println("Starting concurrent scans of test table " + tableNameStr); scanSh.exec("HBASE_CLASSPATH=. hbase " + - "com.cloudera.itest.hbase.system.Scanner " + + "org.apache.bigtop.itest.hbase.system.Scanner " + tableNameStr + " 13 -l " + scannerLoops + " 2>/dev/null"); int splitRows = scanSh.getRet(); http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/BTServices.groovy ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/BTServices.groovy b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/BTServices.groovy new file mode 100644 index 0000000..4d1161c --- /dev/null +++ b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/BTServices.groovy @@ -0,0 +1,114 @@ +/** + * 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.packagesmoke + +import org.apache.bigtop.itest.pmanager.PackageManager + +class BTServices { + static final List serviceDaemonUserNames = [ "flume", "hbase" , "hdfs" , "hue" , "mapred" , "oozie" , "sqoop" , + "zookeeper", "hadoop"]; + + static final Map components = [ + HDFS : [ services : [ "hadoop-namenode", "hadoop-datanode", + "hadoop-secondarynamenode" ], + verifier : new StateVerifierHDFS(), + killIDs : [ "hdfs" ], + ], + mapreduce : [ services : [ "hadoop-namenode", "hadoop-datanode", + "hadoop-jobtracker", "hadoop-tasktracker" ], + killIDs : [ "hdfs", "mapred" ], + verifier : new StateVerifierMapreduce(), + ], + hive : [ services : [ "hadoop-namenode", "hadoop-datanode", + "hadoop-jobtracker", "hadoop-tasktracker" ], + killIDs : [ "hdfs", "mapred" ], + verifier : new StateVerifierHive(), + ], + HBase : [ services : [ "hadoop-namenode", "hadoop-datanode", + "hbase-master" ], + killIDs : [ "hdfs", "hbase" ], + verifier : new StateVerifierHBase(), + ], + zookeeper : [ services : [ "hadoop-zookeeper" ], + verifier : new StateVerifierZookeeper(), + killIDs : [ "zookeeper" ], + ], + oozie : [ services : [ "hadoop-namenode", "hadoop-datanode", "hadoop-jobtracker", "hadoop-tasktracker", + "oozie" ], + killIDs : [ "hdfs", "mapred", "oozie" ], + verifier : new StateVerifierOozie(), + ], + flume : [ services : [ "hadoop-namenode", "hadoop-datanode", + "flume-master", "flume-agent" ], + killIDs : [ "hdfs", "flume" ], + verifier : new StateVerifierFlume(), + ], + sqoop : [ services : [ "hadoop-namenode", "hadoop-datanode", + "sqoop-metastore" ], + killIDs : [ "hdfs", "sqoop" ], + verifier : new StateVerifierSqoop(), + ], + hue : [ services : [ "hadoop-namenode", "hadoop-datanode", "hadoop-jobtracker", "hadoop-tasktracker", + "hue" ], + killIDs : [ "hdfs", "mapred", "hue" ], + verifier : new StateVerifierHue(), + ], + ]; + + static final Map<String, List<String>> release2services = [ + "bigtop" : [ "HDFS", "mapreduce", "hive", "HBase", "zookeeper", "oozie", "flume" ], + "2" : [ "HDFS", "mapreduce", "hive" ], + "3b2" : [ "HDFS", "mapreduce", "hive", "HBase", "zookeeper", "oozie", "flume", "hue" ], + "3b3" : [ "HDFS", "mapreduce", "hive", "HBase", "zookeeper", "oozie", "flume", "sqoop", "hue" ], + "3b4" : [ "HDFS", "mapreduce", "hive", "HBase", "zookeeper", "oozie", "flume", "sqoop", "hue" ], + "3u0" : [ "HDFS", "mapreduce", "hive", "HBase", "zookeeper", "oozie", "flume", "sqoop", "hue" ], + "3u1" : [ "HDFS", "mapreduce", "hive", "HBase", "zookeeper", "oozie", "flume", "sqoop", "hue" ], + "3" : [ "HDFS", "mapreduce", "hive", "HBase", "zookeeper", "oozie", "flume" ], + ]; + + public static Map getServices(String release) { + Map res = [:]; + List<String> services; + + if ((release =~ /\.\./).find()) { + String release_from = release.replaceAll(/\.\..*$/, ""); + release = release.replaceAll(/^.*\.\./, ""); + services = release2services[release].clone(); + release2services[release_from].each { + services.remove(it); + } + } else { + services = release2services[release]; + } + + services.each { + // zookeeper is a very messy case of naming :-( + if (it == "zookeeper" && + (PackageManager.getPackageManager().type == 'apt' || + release == "3" || release == "3u1" || release == "bigtop")) { + res[it] = [ services : [ "hadoop-zookeeper-server" ], + verifier : new StateVerifierZookeeper(), + ]; + } else { + res[it] = components[it]; + } + } + return res; + } +} http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/CDHServices.groovy ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/CDHServices.groovy b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/CDHServices.groovy deleted file mode 100644 index c037b2e..0000000 --- a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/CDHServices.groovy +++ /dev/null @@ -1,114 +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 - * <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.packagesmoke - -import org.apache.bigtop.itest.pmanager.PackageManager - -class CDHServices { - static final List serviceDaemonUserNames = [ "flume", "hbase" , "hdfs" , "hue" , "mapred" , "oozie" , "sqoop" , - "zookeeper", "hadoop"]; - - static final Map components = [ - HDFS : [ services : [ "hadoop-namenode", "hadoop-datanode", - "hadoop-secondarynamenode" ], - verifier : new StateVerifierHDFS(), - killIDs : [ "hdfs" ], - ], - mapreduce : [ services : [ "hadoop-namenode", "hadoop-datanode", - "hadoop-jobtracker", "hadoop-tasktracker" ], - killIDs : [ "hdfs", "mapred" ], - verifier : new StateVerifierMapreduce(), - ], - hive : [ services : [ "hadoop-namenode", "hadoop-datanode", - "hadoop-jobtracker", "hadoop-tasktracker" ], - killIDs : [ "hdfs", "mapred" ], - verifier : new StateVerifierHive(), - ], - HBase : [ services : [ "hadoop-namenode", "hadoop-datanode", - "hbase-master" ], - killIDs : [ "hdfs", "hbase" ], - verifier : new StateVerifierHBase(), - ], - zookeeper : [ services : [ "hadoop-zookeeper" ], - verifier : new StateVerifierZookeeper(), - killIDs : [ "zookeeper" ], - ], - oozie : [ services : [ "hadoop-namenode", "hadoop-datanode", "hadoop-jobtracker", "hadoop-tasktracker", - "oozie" ], - killIDs : [ "hdfs", "mapred", "oozie" ], - verifier : new StateVerifierOozie(), - ], - flume : [ services : [ "hadoop-namenode", "hadoop-datanode", - "flume-master", "flume-agent" ], - killIDs : [ "hdfs", "flume" ], - verifier : new StateVerifierFlume(), - ], - sqoop : [ services : [ "hadoop-namenode", "hadoop-datanode", - "sqoop-metastore" ], - killIDs : [ "hdfs", "sqoop" ], - verifier : new StateVerifierSqoop(), - ], - hue : [ services : [ "hadoop-namenode", "hadoop-datanode", "hadoop-jobtracker", "hadoop-tasktracker", - "hue" ], - killIDs : [ "hdfs", "mapred", "hue" ], - verifier : new StateVerifierHue(), - ], - ]; - - static final Map<String, List<String>> release2services = [ - "bigtop" : [ "HDFS", "mapreduce", "hive", "HBase", "zookeeper", "oozie", "flume" ], - "2" : [ "HDFS", "mapreduce", "hive" ], - "3b2" : [ "HDFS", "mapreduce", "hive", "HBase", "zookeeper", "oozie", "flume", "hue" ], - "3b3" : [ "HDFS", "mapreduce", "hive", "HBase", "zookeeper", "oozie", "flume", "sqoop", "hue" ], - "3b4" : [ "HDFS", "mapreduce", "hive", "HBase", "zookeeper", "oozie", "flume", "sqoop", "hue" ], - "3u0" : [ "HDFS", "mapreduce", "hive", "HBase", "zookeeper", "oozie", "flume", "sqoop", "hue" ], - "3u1" : [ "HDFS", "mapreduce", "hive", "HBase", "zookeeper", "oozie", "flume", "sqoop", "hue" ], - "3" : [ "HDFS", "mapreduce", "hive", "HBase", "zookeeper", "oozie", "flume" ], - ]; - - public static Map getServices(String release) { - Map res = [:]; - List<String> services; - - if ((release =~ /\.\./).find()) { - String release_from = release.replaceAll(/\.\..*$/, ""); - release = release.replaceAll(/^.*\.\./, ""); - services = release2services[release].clone(); - release2services[release_from].each { - services.remove(it); - } - } else { - services = release2services[release]; - } - - services.each { - // zookeeper is a very messy case of naming :-( - if (it == "zookeeper" && - (PackageManager.getPackageManager().type == 'apt' || - release == "3" || release == "3u1" || release == "bigtop")) { - res[it] = [ services : [ "hadoop-zookeeper-server" ], - verifier : new StateVerifierZookeeper(), - ]; - } else { - res[it] = components[it]; - } - } - return res; - } -} http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestCommon.groovy ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestCommon.groovy b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestCommon.groovy index 9cb831e..b407386 100644 --- a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestCommon.groovy +++ b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestCommon.groovy @@ -495,6 +495,6 @@ class PackageTestCommon { } static public boolean isUpgrade() { - return System.getProperty("cdh.prev.repo.version", "") != ""; + return System.getProperty("bigtop.prev.repo.version", "") != ""; } } http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestRepoMgr.groovy ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestRepoMgr.groovy b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestRepoMgr.groovy index 9b90b43..af5155b 100644 --- a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestRepoMgr.groovy +++ b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestRepoMgr.groovy @@ -25,19 +25,19 @@ import static org.apache.bigtop.itest.shell.OS.linux_flavor class PackageTestRepoMgr { PackageManager pm = PackageManager.getPackageManager(); - String cdhRepoVersion; - String cdhRepoFileURL; - String cdhRepoURL; - String cdhKeyURL; - String cdhRepoHost; + String btRepoVersion; + String btRepoFileURL; + String btRepoURL; + String btKeyURL; + String btRepoHost; String repoName; - public PackageTestRepoMgr(String _cdhRepoVersion, String _cdhRepoFileURL, String _cdhRepoURL, String _cdhKeyURL) { - cdhRepoVersion = _cdhRepoVersion; - cdhRepoFileURL = _cdhRepoFileURL; - cdhRepoURL = _cdhRepoURL; - cdhKeyURL = _cdhKeyURL; + public PackageTestRepoMgr(String _btRepoVersion, String _btRepoFileURL, String _btRepoURL, String _btKeyURL) { + btRepoVersion = _btRepoVersion; + btRepoFileURL = _btRepoFileURL; + btRepoURL = _btRepoURL; + btKeyURL = _btKeyURL; } public PackageTestRepoMgr(String prefix) { @@ -45,39 +45,39 @@ class PackageTestRepoMgr { } public PackageTestRepoMgr() { - parseRepoSpec("cdh.repo"); + parseRepoSpec("bigtop.repo"); } public parseRepoSpec(String prefix) { - cdhRepoHost = System.getProperty("${prefix}.host", "nightly.cloudera.com"); - cdhRepoVersion = System.getProperty("${prefix}.version", "bigtop"); + btRepoHost = System.getProperty("${prefix}.host", "www.apache.org/dist/bigtop/stable/repos"); + btRepoVersion = System.getProperty("${prefix}.version", "bigtop"); - Map cdhKeys = [ yum : "http://${cdhRepoHost}/redhat/cdh/RPM-GPG-KEY-cloudera";, + Map btKeys = [ yum : "http://${btRepoHost}/GPG-KEY-bigtop";, zypper : null, - apt : "http://${cdhRepoHost}/debian/archive.key"; ]; - Map cdhRepos = [ yum : "http://${cdhRepoHost}/redhat/cdh/${cdhRepoVersion}";, - zypper : "http://${cdhRepoHost}/sles/11/x86_64/cdh/${cdhRepoVersion}";, - apt : "http://${cdhRepoHost}/debian/"; ]; + apt : "http://${btRepoHost}/GPG-KEY-bigtop"; ]; + Map btRepos = [ yum : "http://${btRepoHost}/centos6";, + zypper : "http://${btRepoHost}/sles11";, + apt : "http://${btRepoHost}/precise/"; ]; - cdhRepoFileURL = System.getProperty("${prefix}.file.url.${linux_flavor.replaceAll(/\s/,'_')}", + btRepoFileURL = System.getProperty("${prefix}.file.url.${linux_flavor.replaceAll(/\s/,'_')}", System.getProperty("${prefix}.file.url", "http://does.not.exist";)); - cdhRepoURL = System.getProperty("${prefix}.url", cdhRepos[pm.getType()]); - cdhKeyURL = System.getProperty("${prefix}.key.url", cdhKeys[pm.getType()]); + btRepoURL = System.getProperty("${prefix}.url", btRepos[pm.getType()]); + btKeyURL = System.getProperty("${prefix}.key.url", btKeys[pm.getType()]); } public boolean addRepo() { - repoName = "cloudera-cdh${cdhRepoVersion}"; + repoName = "bigtop${btRepoVersion}"; pm.cleanup(); try { - String repoText = cdhRepoFileURL.toURL().text; - if (pm.addBinRepo(repoName, repoText, cdhKeyURL) != 0) { + String repoText = btRepoFileURL.toURL().text; + if (pm.addBinRepo(repoName, repoText, btKeyURL) != 0) { return false; } } catch (Throwable ex) { - if (pm.addBinRepo(repoName, cdhRepoURL, cdhKeyURL, "${linux_codename}-cdh${cdhRepoVersion} contrib")) { + if (pm.addBinRepo(repoName, btRepoURL, btKeyURL, "${linux_codename}-bt${btRepoVersion} contrib")) { return false; } } http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesBasics.groovy ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesBasics.groovy b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesBasics.groovy index 75581a6..38013b5 100644 --- a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesBasics.groovy +++ b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesBasics.groovy @@ -43,14 +43,12 @@ class TestPackagesBasics extends PackageTestCommon { // not worry about managing it ourselves via the following static Map. For now, however, we rely on // constructors being synchronized and thus inserting just one copy of PackageInstance for each package we test private static Map<String, PackageInstance> pkgs = [:]; - private static String selectedTests = System.getProperty("cdh.packages.test", "."); - private static String skippedTests = System.getProperty("cdh.packages.skip", "\$^"); + private static String selectedTests = System.getProperty("bigtop.packages.test", "."); + private static String skippedTests = System.getProperty("bigtop.packages.skip", "\$^"); public Node golden; static { - // repo = new PackageTestRepoMgr("3", "", "http://nightly.cloudera.com/debian/";, - // "http://nightly.cloudera.com/debian/archive.key";); repo = new PackageTestRepoMgr(); TestPackagesBasics.pm = repo.getPm(); } http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesPseudoDistributed.groovy ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesPseudoDistributed.groovy b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesPseudoDistributed.groovy index 5824aec..32f59c2 100644 --- a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesPseudoDistributed.groovy +++ b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesPseudoDistributed.groovy @@ -38,7 +38,7 @@ class TestPackagesPseudoDistributed extends TestPackagesBasics { void testPackageUpgrade() { if (isUpgrade()) { checkThat("upgrade sequence on a package $name failed to be executed", - CDHUpgradeSequence.execute(name, System.getProperty("cdh.prev.repo.version"), "3"), equalTo(0)); + BTUpgradeSequence.execute(name, System.getProperty("bigtop.prev.repo.version"), "0.5.0"), equalTo(0)); } } http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesPseudoDistributedDependency.groovy ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesPseudoDistributedDependency.groovy b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesPseudoDistributedDependency.groovy index f7724cb..2df72fc 100644 --- a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesPseudoDistributedDependency.groovy +++ b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesPseudoDistributedDependency.groovy @@ -38,7 +38,7 @@ class TestPackagesPseudoDistributedDependency extends TestPackagesBasics { void testPackageUpgrade() { if (isUpgrade()) { checkThat("upgrade sequence on a package $name failed to be executed", - CDHUpgradeSequence.execute(name, System.getProperty("cdh.prev.repo.version"), "3"), equalTo(0)); + BTUpgradeSequence.execute(name, System.getProperty("bigtop.prev.repo.version"), "0.5.0"), equalTo(0)); } } http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesPseudoDistributedFileContents.groovy ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesPseudoDistributedFileContents.groovy b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesPseudoDistributedFileContents.groovy index 57febf4..47699d1 100644 --- a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesPseudoDistributedFileContents.groovy +++ b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesPseudoDistributedFileContents.groovy @@ -38,7 +38,7 @@ class TestPackagesPseudoDistributedFileContents extends TestPackagesBasics { void testPackageUpgrade() { if (isUpgrade()) { checkThat("upgrade sequence on a package $name failed to be executed", - CDHUpgradeSequence.execute(name, System.getProperty("cdh.prev.repo.version"), "3"), equalTo(0)); + BTUpgradeSequence.execute(name, System.getProperty("bigtop.prev.repo.version"), "0.5.0"), equalTo(0)); } } http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesPseudoDistributedServices.groovy ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesPseudoDistributedServices.groovy b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesPseudoDistributedServices.groovy index 6591279..0647f93 100644 --- a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesPseudoDistributedServices.groovy +++ b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesPseudoDistributedServices.groovy @@ -38,7 +38,7 @@ class TestPackagesPseudoDistributedServices extends TestPackagesBasics { void testPackageUpgrade() { if (isUpgrade()) { checkThat("upgrade sequence on a package $name failed to be executed", - CDHUpgradeSequence.execute(name, System.getProperty("cdh.prev.repo.version"), "3"), equalTo(0)); + BTUpgradeSequence.execute(name, System.getProperty("bigtop.prev.repo.version"), "0.5.0"), equalTo(0)); } } http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestServices.groovy ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestServices.groovy b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestServices.groovy index 27e6ff5..4f20524 100644 --- a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestServices.groovy +++ b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestServices.groovy @@ -46,7 +46,7 @@ class TestServices { static Map<String, Object[]> generateTests() { // Look for how it gets reset by CreateServiceState class to understand // why it works in the upgrade scenario case - return selectServices(System.getProperty("cdh.repo.version", "3")); + return selectServices(System.getProperty("bigtop.repo.version", "0.6.0")); } TestServices(Map.Entry svc) { @@ -56,9 +56,9 @@ class TestServices { killIDs = svcDescr.value.killIDs; } - static Map<String, Object[]> selectServices(String CDHrelease) { + static Map<String, Object[]> selectServices(String BTrelease) { Map<String, Object[]> res = [:]; - CDHServices.getServices(CDHrelease).each { + BTServices.getServices(BTrelease).each { String name = it.key.toString(); res[name] = ([it] as Object[]); } @@ -68,7 +68,7 @@ class TestServices { @AfterClass static void tearDown() { // TODO: this is pretty silly, but it'll do for now - CDHServices.serviceDaemonUserNames.each { + BTServices.serviceDaemonUserNames.each { shRoot.exec("kill -9 `ps -U${it} -opid=`"); } } http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestServicesCreateState.groovy ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestServicesCreateState.groovy b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestServicesCreateState.groovy index 42e01d6..f877411 100644 --- a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestServicesCreateState.groovy +++ b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestServicesCreateState.groovy @@ -24,8 +24,8 @@ import org.junit.runners.Parameterized.Parameters class TestServicesCreateState extends TestServices { @Parameters static Map<String, Object[]> generateTests() { - return selectServices(System.getProperty("cdh.prev.repo.version", - System.getProperty("cdh.repo.version", "3"))); + return selectServices(System.getProperty("bigtop.prev.repo.version", + System.getProperty("bigtop.repo.version", "0.6.0"))); } TestServicesCreateState(Map.Entry ent) { http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestServicesCreateStateMissing.groovy ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestServicesCreateStateMissing.groovy b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestServicesCreateStateMissing.groovy index 554510f..7e714ea 100644 --- a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestServicesCreateStateMissing.groovy +++ b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestServicesCreateStateMissing.groovy @@ -22,7 +22,7 @@ import org.junit.runners.Parameterized.Parameters class TestServicesCreateStateMissing extends TestServicesCreateState { @Parameters static Map<String, Object[]> generateTests() { - return selectServices("${System.getProperty('cdh.prev.repo.version','3')}..${System.getProperty('cdh.repo.version', '3')}"); + return selectServices("${System.getProperty('bigtop.prev.repo.version','0.5.0')}..${System.getProperty('bigtop.repo.version', '0.6.0')}"); } TestServicesCreateStateMissing(Map.Entry ent) { http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/bigtop-tests/test-execution/package/pom.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-execution/package/pom.xml b/bigtop-tests/test-execution/package/pom.xml index e0c432e..608ac67 100644 --- a/bigtop-tests/test-execution/package/pom.xml +++ b/bigtop-tests/test-execution/package/pom.xml @@ -33,8 +33,8 @@ <name>packagesmokes</name> <properties> - <cdh.repo.host>archive.cloudera.com</cdh.repo.host> - <cdh.repo.version>3</cdh.repo.version> + <bigtop.repo.host>www.apache.org/dist/bigtop/stable/repos</bigtop.repo.host> + <bigtop.repo.version>0.5.0</bigtop.repo.version> <org.apache.maven-dependency-plugin.groupId>org.apache.bigtop.itest</org.apache.maven-dependency-plugin.groupId> <org.apache.maven-dependency-plugin.artifactId>package-smoke</org.apache.maven-dependency-plugin.artifactId> @@ -60,8 +60,8 @@ <artifactId>maven-failsafe-plugin</artifactId> <configuration> <systemPropertyVariables> - <cdh.repo.host>${cdh.repo.host}</cdh.repo.host> - <cdh.repo.version>${cdh.repo.version}</cdh.repo.version> + <bigtop.repo.host>${bigtop.repo.host}</bigtop.repo.host> + <bigtop.repo.version>${bigtop.repo.version}</bigtop.repo.version> </systemPropertyVariables> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/bigtop-tests/test-execution/smokes/datafu/pom.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-execution/smokes/datafu/pom.xml b/bigtop-tests/test-execution/smokes/datafu/pom.xml index 73da516..d14b031 100644 --- a/bigtop-tests/test-execution/smokes/datafu/pom.xml +++ b/bigtop-tests/test-execution/smokes/datafu/pom.xml @@ -127,9 +127,9 @@ </systemPropertyVariables> </configuration> - <!-- configuration> - <testSourceDirectory>/root/stacks/smokes/datafu/target/com/cloudera/itest/datafu/</testSourceDirectory> - <testClassesDirectory>/root/.m2/repository/com/cloudera/itest/datafu/4.1-cdh4u1-SNAPSHOT/</testClassesDirectory> + <!-- Disabling for now: configuration> + <testSourceDirectory>src</testSourceDirectory> + <testClassesDirectory>target/classes</testClassesDirectory> <skipTests>false</skipTests> <testFailureIgnore>false</testFailureIgnore> <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Djava.endorsed.dirs=${project.build.testOutputDirectory}/endorsed</argLine> http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/bigtop-tests/test-execution/smokes/sqoop/pom.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-execution/smokes/sqoop/pom.xml b/bigtop-tests/test-execution/smokes/sqoop/pom.xml index de5a123..c53b31d 100644 --- a/bigtop-tests/test-execution/smokes/sqoop/pom.xml +++ b/bigtop-tests/test-execution/smokes/sqoop/pom.xml @@ -36,7 +36,7 @@ <org.codehaus.maven-failsafe-plugin.dbhost>172.29.12.207</org.codehaus.maven-failsafe-plugin.dbhost> <org.codehaus.maven-failsafe-plugin.dbname>db2</org.codehaus.maven-failsafe-plugin.dbname> - <org.apache.maven-dependency-plugin.groupId>com.cloudera.sqoop</org.apache.maven-dependency-plugin.groupId> + <org.apache.maven-dependency-plugin.groupId>org.apache.sqoop</org.apache.maven-dependency-plugin.groupId> <org.apache.maven-dependency-plugin.artifactId>sqoop</org.apache.maven-dependency-plugin.artifactId> <org.apache.maven-dependency-plugin.version>${sqoop.version}</org.apache.maven-dependency-plugin.version> <org.apache.maven-dependency-plugin.output>${project.build.directory}</org.apache.maven-dependency-plugin.output> http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/src/site/xdoc/index.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml index 81f9a7b..6b24161 100644 --- a/src/site/xdoc/index.xml +++ b/src/site/xdoc/index.xml @@ -107,7 +107,7 @@ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd The Apache Jenkins server runs the "Bigtop-trunk" job whenever code is committed to the trunk branch, which in turn runs several test jobs. </p> <p> - The Cloudera Jenkins server runs daily jobs for the 0.3 and trunk branches, and each job has a configuration for each supported operating system. + The Bigtop Jenkins server runs daily jobs for the 0.3 and trunk branches, and each job has a configuration for each supported operating system. In each branch there is a job to build each component, a job to run package tests and a job to build package repositories. There are also jobs for building virtual machine images as well as the 2 most recent releases and other miscellaneous tasks for various RCs and tests. For example: http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/test/MANIFEST.txt ---------------------------------------------------------------------- diff --git a/test/MANIFEST.txt b/test/MANIFEST.txt index bd0902c..f1c6b94 100644 --- a/test/MANIFEST.txt +++ b/test/MANIFEST.txt @@ -3,19 +3,6 @@ ASF License 2.0 commons-logging:commons-logging:jar:1.1 ASF org.apache.ant:ant-junit:jar:1.8.2 ASF org.apache.pig:pigsmoke:jar:0.8.0-SNAPSHOT ASF - org.apache.hadoop:hadoop-core:jar:0.20.2-cdh3u0 ASF Public Code License 1.0 junit:junit:jar:4.8.1 JUnit - -Developed by Cloudera - com.cloudera.sqoop:sqoop:jar:1.2.0-cdh3u0 - org.apache.bigtop.itest:smoke-tests-conf:jar:1.1-SNAPSHOT - org.apache.bigtop.itest:itest-common:jar:1.1-SNAPSHOT - org.apache.bigtop.itest:hivesmoke:test-jar:tests:0.7.0-cdh3u1-SNAPSHOT - org.apache.bigtop.itest:smoke-tests-conf:jar:1.1-SNAPSHOT - org.apache.bigtop.itest:itest-common:jar:1.1-SNAPSHOT - org.apache.bigtop.itest:hadoopsmoke:test-jar:tests:0.20.2-cdh3u1-SNAPSHOT - org.apache.bigtop.itest:ooziesmoke:test-jar:tests:2.3.0-cdh3u1-SNAPSHOT - org.apache.bigtop.itest:flumesmoke:test-jar:tests:0.9.3-cdh3u1-SNAPSHOT - org.apache.bigtop.itest:hbasesmoke:test-jar:tests:0.90.1-cdh3u1-SNAPSHOT http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/test/NOTICE.txt ---------------------------------------------------------------------- diff --git a/test/NOTICE.txt b/test/NOTICE.txt index d12bc79..09697dc 100644 --- a/test/NOTICE.txt +++ b/test/NOTICE.txt @@ -13,6 +13,3 @@ # See the License for the specific language governing permissions and # limitations under the License. -This product includes software developed by Cloudera, Inc. -(http://www.cloudera.com/). - http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/test/site/pom.xml ---------------------------------------------------------------------- diff --git a/test/site/pom.xml b/test/site/pom.xml index 699e294..508a055 100644 --- a/test/site/pom.xml +++ b/test/site/pom.xml @@ -24,7 +24,7 @@ <version>1.0-SNAPSHOT</version> <name>iTest</name> - <url>http://cloudera.github.com/iTest</url> + <url>http://bigtop.apache.org/</url> <inceptionYear>2011</inceptionYear> <developers> <developer> @@ -51,8 +51,8 @@ </scm> <distributionManagement> <site> - <id>github-project-site</id> - <url>gitsite:[email protected]/cloudera/iTest.git</url> + <id>git-project-site</id> + <url>http://git-wip-us.apache.org/repos/asf/bigtop.git</url> </site> </distributionManagement> http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/test/site/src/site/apt/downloads.apt ---------------------------------------------------------------------- diff --git a/test/site/src/site/apt/downloads.apt b/test/site/src/site/apt/downloads.apt index 9185adb..7f5a95c 100644 --- a/test/site/src/site/apt/downloads.apt +++ b/test/site/src/site/apt/downloads.apt @@ -21,8 +21,8 @@ Getting iTest * Download {binary} artifact. - iTest can be obtained in a form of binary maven artifact from Cloudera Maven -repository. The repository is located at repository.cloudera.com + iTest can be obtained in a form of binary maven artifact from Maven +repository http://mvnrepository.com/artifact/org.apache.bigtop.itest/itest-common All you need to do is to add the following dependency into your project pom http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/test/site/src/site/fml/faq.fml ---------------------------------------------------------------------- diff --git a/test/site/src/site/fml/faq.fml b/test/site/src/site/fml/faq.fml index 5c61181..b74898d 100644 --- a/test/site/src/site/fml/faq.fml +++ b/test/site/src/site/fml/faq.fml @@ -1,18 +1,20 @@ <?xml version="1.0"?> <!-- - ~ Copyright (c) 2011, Cloudera, Inc. All Rights Reserved. - ~ - ~ Cloudera, Inc. 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 - ~ - ~ This software 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. - --> + 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. +--> <faqs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns="http://maven.apache.org/FML/1.0"; xsi:schemaLocation="http://maven.apache.org/FML/1.0 http://maven.apache.org/xsd/fml-1.0.xsd"; http://git-wip-us.apache.org/repos/asf/bigtop/blob/0013eba3/test/site/src/site/site.xml ---------------------------------------------------------------------- diff --git a/test/site/src/site/site.xml b/test/site/src/site/site.xml index 98ab0bd..a6c6a8a 100644 --- a/test/site/src/site/site.xml +++ b/test/site/src/site/site.xml @@ -1,35 +1,35 @@ <?xml version="1.0" encoding="ISO-8859-1"?> - <!-- - ~ Copyright (c) 2011, Cloudera, Inc. All Rights Reserved. - ~ - ~ Cloudera, Inc. 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 - ~ - ~ This software 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. - --> + 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. +--> <project name="iTest" xmlns="http://maven.apache.org/DECORATION/1.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd";> <bannerLeft> <name>iTest</name> - <src>http://cloudera.github.com/iTest/images/itest.png</src> - <href>http://cloudera.github.com/iTest/</href> + <src>http://bigtop.apache.org/images/bigtop-logo.png</src> + <href>http://bigtop.apache.org/</href> </bannerLeft> <bannerRight> - <src>http://cloudera.github.com/iTest/images/banner.png</src> + <src>http://bigtop.apache.org/images/bigtop-logo.png</src> </bannerRight> <body> <links> <item name="Apache" href="http://www.apache.org/"; /> - <item name="iTest 1.0" href="http://github.com/cloudera/iTest"/> + <item name="iTest 1.0" href="http://bigtop.apache.org/"/> </links> <menu name="iTest">
