Skip to content

Commit 7cc5d2a

Browse files
committed
Merge remote-tracking branch 'up/master' into HBASE-29585
2 parents 24a7ba8 + 6d7829a commit 7cc5d2a

File tree

300 files changed

+12586
-8349
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

300 files changed

+12586
-8349
lines changed

dev-support/Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ pipeline {
5959
ASF_NIGHTLIES_BASE_ORI = "${ASF_NIGHTLIES}/hbase/${JOB_NAME}/${BUILD_NUMBER}"
6060
ASF_NIGHTLIES_BASE = "${ASF_NIGHTLIES_BASE_ORI.replaceAll(' ', '%20')}"
6161
// These are dependent on the branch
62-
HADOOP3_VERSIONS = "3.3.5,3.3.6,3.4.0,3.4.1"
63-
HADOOP3_DEFAULT_VERSION = "3.4.1"
62+
HADOOP3_VERSIONS = "3.3.5,3.3.6,3.4.0,3.4.1,3.4.2"
63+
HADOOP3_DEFAULT_VERSION = "3.4.2"
6464
}
6565
parameters {
6666
booleanParam(name: 'USE_YETUS_PRERELEASE', defaultValue: false, description: '''Check to use the current HEAD of apache/yetus rather than our configured release.

dev-support/hbase-personality.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -612,17 +612,17 @@ function hadoopcheck_rebuild
612612
# TODO remove this on non 2.5 branches ?
613613
yetus_info "Setting Hadoop 3 versions to test based on branch-2.5 rules"
614614
if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then
615-
hbase_hadoop3_versions="3.2.4 3.3.6 3.4.0"
615+
hbase_hadoop3_versions="3.2.4 3.3.6 3.4.1"
616616
else
617-
hbase_hadoop3_versions="3.2.3 3.2.4 3.3.2 3.3.3 3.3.4 3.3.5 3.3.6 3.4.0"
617+
hbase_hadoop3_versions="3.2.3 3.2.4 3.3.2 3.3.3 3.3.4 3.3.5 3.3.6 3.4.0 3.4.1"
618618
fi
619619
else
620620
yetus_info "Setting Hadoop 3 versions to test based on branch-2.6+/master/feature branch rules"
621621
# Isn't runnung these tests with the default Hadoop version redundant ?
622622
if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then
623-
hbase_hadoop3_versions="3.3.6 3.4.0"
623+
hbase_hadoop3_versions="3.3.6 3.4.1"
624624
else
625-
hbase_hadoop3_versions="3.3.5 3.3.6 3.4.0"
625+
hbase_hadoop3_versions="3.3.5 3.3.6 3.4.0 3.4.1"
626626
fi
627627
fi
628628

hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ClientTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,5 @@
3636
* @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
3737
*/
3838
public interface ClientTests {
39+
public static final String TAG = "org.apache.hadoop.hbase.testclassification.ClientTests";
3940
}

hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/CoprocessorTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,5 @@
3535
* @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
3636
*/
3737
public interface CoprocessorTests {
38+
public static final String TAG = "org.apache.hadoop.hbase.testclassification.CoprocessorTests";
3839
}

hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/FilterTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,5 @@
3535
* @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
3636
*/
3737
public interface FilterTests {
38+
public static final String TAG = "org.apache.hadoop.hbase.testclassification.FilterTests";
3839
}

hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/FlakeyTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,5 @@
3535
* @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
3636
*/
3737
public interface FlakeyTests {
38+
public static final String TAG = "org.apache.hadoop.hbase.testclassification.FlakeyTests";
3839
}

hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/IOTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,5 @@
3636
* @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
3737
*/
3838
public interface IOTests {
39+
public static final String TAG = "org.apache.hadoop.hbase.testclassification.IOTests";
3940
}

hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/IntegrationTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,5 @@
3434
* @see LargeTests
3535
*/
3636
public interface IntegrationTests {
37+
public static final String TAG = "org.apache.hadoop.hbase.testclassification.IntegrationTests";
3738
}

hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/LargeTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,5 @@
3333
* @see IntegrationTests
3434
*/
3535
public interface LargeTests {
36+
public static final String TAG = "org.apache.hadoop.hbase.testclassification.LargeTests";
3637
}

hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MapReduceTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,5 @@
3535
* @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
3636
*/
3737
public interface MapReduceTests {
38+
public static final String TAG = "org.apache.hadoop.hbase.testclassification.MapReduceTests";
3839
}

0 commit comments

Comments
 (0)