From 383d590cb388f09663ce0933f38071282d2be3af Mon Sep 17 00:00:00 2001
From: Spencer <spalger@users.noreply.github.com>
Date: Fri, 20 Apr 2018 02:26:25 -0700
Subject: [PATCH] [grunt] remove .rej file check (#17805) (#17806)

The old backport tool we used, Jasper, would create PRs with .rej files
when it couldn't merge a backport cleanly. That lead to this task which
would skip the tests if .rej files were found. Now we don't use Jasper
and this check takes about 1 minute to run on CI, so we can remove it
and save some time.
---
 tasks/jenkins.js          |  3 ---
 tasks/reject_rej_files.js | 23 -----------------------
 2 files changed, 26 deletions(-)
 delete mode 100644 tasks/reject_rej_files.js

diff --git a/tasks/jenkins.js b/tasks/jenkins.js
index ec16a834b511..69cd47a2db21 100644
--- a/tasks/jenkins.js
+++ b/tasks/jenkins.js
@@ -5,7 +5,6 @@ module.exports = function (grunt) {
   // TODO: remove after migration to new CI is complete
   grunt.registerTask('jenkins', compact([
     'jenkins:env',
-    'rejectRejFiles',
     'test',
     process.env.JOB_NAME === 'kibana_core' ? 'build' : null
   ]));
@@ -27,7 +26,6 @@ module.exports = function (grunt) {
 
   grunt.registerTask('jenkins:unit', [
     'jenkins:env',
-    'rejectRejFiles',
 
     'run:eslint',
     'licenses',
@@ -44,7 +42,6 @@ module.exports = function (grunt) {
   grunt.config.set('functional_test_runner.functional.options.configOverrides.mochaOpts.bail', true);
   grunt.registerTask('jenkins:selenium', [
     'jenkins:env',
-    'rejectRejFiles',
 
     'test:uiRelease'
   ]);
diff --git a/tasks/reject_rej_files.js b/tasks/reject_rej_files.js
deleted file mode 100644
index f49178669221..000000000000
--- a/tasks/reject_rej_files.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Fails if any .rej files are found
-// .rej files are an artifact from a failed git-apply or a jasper backport
-
-// This check is intentionally performed on the files in the repo rather than
-// on the files that are to be committed.
-
-export default grunt => {
-  grunt.registerTask('rejectRejFiles', 'Reject any git-apply .rej files', () => {
-    const files = grunt.file.expand([
-      '**/*.rej',
-      '!.es/**/*.rej',
-      '!plugins/**/*.rej',
-      '!optimize/**/*.rej',
-      '!**/node_modules/**/*.rej',
-    ]);
-
-    if (files.length > 0) {
-      const err = `.rej files are not allowed:\n${files.join('\n')}`;
-      grunt.log.error(err);
-      return false;
-    }
-  });
-};