From a7d8a962814ba1b9d1a1d33a174a052d9d75aad6 Mon Sep 17 00:00:00 2001
From: Sebastian Spaink <3441183+sspaink@users.noreply.github.com>
Date: Mon, 13 Jun 2022 12:03:22 -0500
Subject: [PATCH] fix: Remove all rebase logic from CI (#11293)

---
 .circleci/config.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 53c90df2a72b7..25cf18043445d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -37,14 +37,6 @@ commands:
   check-changed-files-or-halt:
     steps:
       - run: ./scripts/check-file-changes.sh
-  rebase-on-master:
-    steps:
-      - run: |
-          git config --global user.email "telegraf@influxdb.com"
-          git config --global user.name "telegraf"
-          git remote add upstream https://github.com/influxdata/telegraf
-          git fetch upstream
-          git rebase upstream/master
   test-go:
     parameters:
       os:
@@ -62,7 +54,6 @@ commands:
     steps:
       - checkout
       - check-changed-files-or-halt
-      - rebase-on-master
       - when:
           condition:
             equal: [ linux, << parameters.os >> ]