From d4c4af09a1ee8601e4e1390f108618f02db2d925 Mon Sep 17 00:00:00 2001
From: Sean Busbey <busbey@apache.org>
Date: Sat, 24 Feb 2018 15:50:12 -0600
Subject: [PATCH] HBASE-20075 remove logic for branch-1.1 nightly testing

Signed-off-by: Michael Stack <stack@apache.org>
---
 dev-support/Jenkinsfile | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index 601eadba61b..9c0ff0a9945 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -195,10 +195,6 @@ curl -L  -o personality.sh "${env.PROJECT_PERSONALITY}"
               "${BASEDIR}/dev-support/gather_machine_environment.sh" "${OUTPUT_DIR_RELATIVE}/machine"
 '''
             sh '''#!/usr/bin/env bash
-              # for branch-1.1 we don't do jdk8 findbugs, so do it here
-              if [ "${BRANCH_NAME}" == "branch-1.1" ]; then
-                TESTS+=",findbugs"
-              fi
               rm -rf "${OUTPUT_DIR}/commentfile}"
               declare -i status=0
               if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then
@@ -249,11 +245,6 @@ curl -L  -o personality.sh "${env.PROJECT_PERSONALITY}"
       label 'Hadoop'
     }
   }
-          when {
-            not {
-              branch 'branch-1.1*'
-            }
-          }
           environment {
             TESTS = 'mvninstall,compile,javac,unit,findbugs,htmlout'
             OUTPUT_DIR_RELATIVE = "${env.OUTPUT_DIR_RELATIVE_HADOOP2}"