diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile index db15856909a1..b2923c487910 100644 --- a/dev-support/Jenkinsfile +++ b/dev-support/Jenkinsfile @@ -30,7 +30,7 @@ pipeline { skipDefaultCheckout() } environment { - YETUS_RELEASE = '0.9.0' + YETUS_RELEASE = '0.11.0' // where we'll write everything from different steps. Need a copy here so the final step can check for success/failure. OUTPUT_DIR_RELATIVE_GENERAL = 'output-general' OUTPUT_DIR_RELATIVE_JDK7 = 'output-jdk7' diff --git a/dev-support/Jenkinsfile_GitHub b/dev-support/Jenkinsfile_GitHub index 63cadeb2bdc1..f542432a5ada 100644 --- a/dev-support/Jenkinsfile_GitHub +++ b/dev-support/Jenkinsfile_GitHub @@ -37,7 +37,7 @@ pipeline { DOCKERFILE = "${SOURCEDIR}/dev-support/docker/Dockerfile" YETUS='yetus' // Branch or tag name. Yetus release tags are 'rel/X.Y.Z' - YETUS_VERSION='rel/0.10.0' + YETUS_VERSION='rel/0.11.0' } parameters { @@ -151,7 +151,6 @@ pipeline { YETUS_ARGS+=("--docker") YETUS_ARGS+=("--dockerfile=${DOCKERFILE}") YETUS_ARGS+=("--mvn-custom-repos") - YETUS_ARGS+=("--jenkins") YETUS_ARGS+=("--multijdkdirs=/usr/lib/jvm/java-8-openjdk-amd64") YETUS_ARGS+=("--findbugs-home=/usr") YETUS_ARGS+=("--whitespace-eol-ignore-list=.*/generated/.*") @@ -159,10 +158,12 @@ pipeline { YETUS_ARGS+=("--personality=${SOURCEDIR}/dev-support/hbase-personality.sh") YETUS_ARGS+=("--quick-hadoopcheck") YETUS_ARGS+=("--skip-errorprone") - # effectively treat dev-support as a custom maven module - YETUS_ARGS+=("--skip-dir=dev-support") + # effectively treat dev-support as a custom maven module + YETUS_ARGS+=("--skip-dirs=dev-support") # help keep the ASF boxes clean YETUS_ARGS+=("--sentinel") + # use emoji vote so it is easier to find the broken line + YETUS_ARGS+=("--github-use-emoji-vote") "${TESTPATCHBIN}" "${YETUS_ARGS[@]}" ''' } diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index a37f883f9493..5147ef3796a0 100755 --- a/dev-support/hbase-personality.sh +++ b/dev-support/hbase-personality.sh @@ -86,15 +86,19 @@ function personality_parse_args for i in "$@"; do case ${i} in --exclude-tests-url=*) + delete_parameter "${i}" EXCLUDE_TESTS_URL=${i#*=} ;; --include-tests-url=*) + delete_parameter "${i}" INCLUDE_TESTS_URL=${i#*=} ;; --hadoop-profile=*) + delete_parameter "${i}" HADOOP_PROFILE=${i#*=} ;; --skip-errorprone) + delete_parameter "${i}" SKIP_ERRORPRONE=true ;; esac @@ -462,6 +466,7 @@ function hadoopcheck_parse_args for i in "$@"; do case ${i} in --quick-hadoopcheck) + delete_parameter "${i}" QUICK_HADOOPCHECK=true ;; esac