This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/master by this push:
     new 6cd092b  Revert "HBASE-26697 Migrate HBase Nightly HBase-Flaky-Tests 
and HBase-Find-Flaky-Tests to ci-hbase (#4053)"
6cd092b is described below

commit 6cd092b6852a618836a0d0809727c1d2fd657091
Author: Duo Zhang <[email protected]>
AuthorDate: Sat Jan 22 19:35:44 2022 +0800

    Revert "HBASE-26697 Migrate HBase Nightly HBase-Flaky-Tests and 
HBase-Find-Flaky-Tests to ci-hbase (#4053)"
    
    This reverts commit a42d6dbbf72fc685536a26a689399bee056487d2.
---
 dev-support/Jenkinsfile                             | 2 +-
 dev-support/Jenkinsfile_GitHub                      | 3 +--
 dev-support/flaky-tests/flaky-reporting.Jenkinsfile | 4 ++--
 dev-support/flaky-tests/run-flaky-tests.Jenkinsfile | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index aa62a21..15f192c 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -49,7 +49,7 @@ pipeline {
     ARCHIVE_PATTERN_LIST = 'TEST-*.xml,org.apache.h*.txt,*.dumpstream,*.dump'
     // These tests currently have known failures. Once they burn down to 0, 
remove from here so that new problems will cause a failure.
     TESTS_FILTER = 
'cc,checkstyle,javac,javadoc,pylint,shellcheck,whitespace,perlcritic,ruby-lint,rubocop,mvnsite'
-    EXCLUDE_TESTS_URL = 
"${JENKINS_URL}/job/HBase-Find-Flaky-Tests/job/${BRANCH_NAME}/lastSuccessfulBuild/artifact/output/excludes"
+    EXCLUDE_TESTS_URL = 
"${JENKINS_URL}/job/HBase/job/HBase-Find-Flaky-Tests/job/${BRANCH_NAME}/lastSuccessfulBuild/artifact/output/excludes"
       // TODO does hadoopcheck need to be jdk specific?
     SHALLOW_CHECKS = 'all,-shadedjars,-unit' // run by the 'yetus general 
check'
     DEEP_CHECKS = 'compile,htmlout,javac,maven,mvninstall,shadedjars,unit' // 
run by 'yetus jdkX (HadoopY) checks'
diff --git a/dev-support/Jenkinsfile_GitHub b/dev-support/Jenkinsfile_GitHub
index b94b1c1..c9dee54 100644
--- a/dev-support/Jenkinsfile_GitHub
+++ b/dev-support/Jenkinsfile_GitHub
@@ -44,8 +44,7 @@ pipeline {
         ARCHIVE_PATTERN_LIST = 
'TEST-*.xml,org.apache.h*.txt,*.dumpstream,*.dump'
         // These tests currently have known failures. Once they burn down to 
0, remove from here so that new problems will cause a failure.
         TESTS_FILTER = 
'cc,checkstyle,javac,javadoc,pylint,shellcheck,whitespace,perlcritic,ruby-lint,rubocop,mvnsite'
-        NEW_JENKINS_URL = 'https://ci-hbase.apache.org'
-        EXCLUDE_TESTS_URL = 
"${NEW_JENKINS_URL}/job/HBase-Find-Flaky-Tests/job/${CHANGE_TARGET}/lastSuccessfulBuild/artifact/output/excludes"
+        EXCLUDE_TESTS_URL = 
"${JENKINS_URL}/job/HBase/job/HBase-Find-Flaky-Tests/job/${CHANGE_TARGET}/lastSuccessfulBuild/artifact/output/excludes"
 
         // a global view of paths. parallel stages can land on the same host 
concurrently, so each
         // stage works in its own subdirectory. there is an "output" under 
each of these
diff --git a/dev-support/flaky-tests/flaky-reporting.Jenkinsfile 
b/dev-support/flaky-tests/flaky-reporting.Jenkinsfile
index b37045b..22f88fa 100644
--- a/dev-support/flaky-tests/flaky-reporting.Jenkinsfile
+++ b/dev-support/flaky-tests/flaky-reporting.Jenkinsfile
@@ -43,8 +43,8 @@ pipeline {
             set -x
           fi
           declare -a flaky_args
-          flaky_args=("${flaky_args[@]}" --urls 
"${JENKINS_URL}/job/HBase%20Nightly/job/${BRANCH_NAME}" --is-yetus True 
--max-builds 20)
-          flaky_args=("${flaky_args[@]}" --urls 
"${JENKINS_URL}/job/HBase-Flaky-Tests/job/${BRANCH_NAME}" --is-yetus False 
--max-builds 50)
+          flaky_args=("${flaky_args[@]}" --urls 
"${JENKINS_URL}/job/HBase/job/HBase%20Nightly/job/${BRANCH_NAME}" --is-yetus 
True --max-builds 20)
+          flaky_args=("${flaky_args[@]}" --urls 
"${JENKINS_URL}/job/HBase/job/HBase-Flaky-Tests/job/${BRANCH_NAME}" --is-yetus 
False --max-builds 50)
           docker build -t hbase-dev-support dev-support
           docker run --ulimit nproc=12500 -v "${WORKSPACE}":/hbase -u `id 
-u`:`id -g` --workdir=/hbase hbase-dev-support \
             python dev-support/flaky-tests/report-flakies.py --mvn -v -o 
output "${flaky_args[@]}"
diff --git a/dev-support/flaky-tests/run-flaky-tests.Jenkinsfile 
b/dev-support/flaky-tests/run-flaky-tests.Jenkinsfile
index da22434..a681d3c 100644
--- a/dev-support/flaky-tests/run-flaky-tests.Jenkinsfile
+++ b/dev-support/flaky-tests/run-flaky-tests.Jenkinsfile
@@ -52,7 +52,7 @@ pipeline {
             mvn_args=("${mvn_args[@]}" -X)
             set -x
           fi
-          curl "${curl_args[@]}" -o includes.txt 
"${JENKINS_URL}/job/HBase-Find-Flaky-Tests/job/${BRANCH_NAME}/lastSuccessfulBuild/artifact/output/includes"
+          curl "${curl_args[@]}" -o includes.txt 
"${JENKINS_URL}/job/HBase/job/HBase-Find-Flaky-Tests/job/${BRANCH_NAME}/lastSuccessfulBuild/artifact/output/includes"
           if [ -s includes.txt ]; then
             rm -rf local-repository/org/apache/hbase
             mvn clean "${mvn_args[@]}"

Reply via email to