From 374ad4e6ef2464fbd2346c0a5d489f3675bd9021 Mon Sep 17 00:00:00 2001
From: Eric Lunderberg <elunderberg@octoml.ai>
Date: Fri, 12 Jul 2024 12:57:48 -0500
Subject: [PATCH 1/2] [CI] Remove lint step from `unity/pr-head` step

This step should only be performed as part of the `lint/pr-head` CI
step.  It was included as part of the unity-specific CI steps prior to
merging of unity into main.  It is no longer necessary as part of
`unity/pr-head`.
---
 ci/jenkins/unity_jenkinsfile.groovy    |  8 --------
 tests/scripts/unity/task_extra_lint.sh | 23 -----------------------
 2 files changed, 31 deletions(-)
 mode change 100644 => 100755 ci/jenkins/unity_jenkinsfile.groovy
 delete mode 100755 tests/scripts/unity/task_extra_lint.sh

diff --git a/ci/jenkins/unity_jenkinsfile.groovy b/ci/jenkins/unity_jenkinsfile.groovy
old mode 100644
new mode 100755
index b9047e8b6f64..9b4f0009e344
--- a/ci/jenkins/unity_jenkinsfile.groovy
+++ b/ci/jenkins/unity_jenkinsfile.groovy
@@ -210,14 +210,6 @@ def lint(node_type) {
           )
           skip_ci = should_skip_ci(env.CHANGE_ID)
           skip_slow_tests = should_skip_slow_tests(env.CHANGE_ID)
-          sh(
-            script: "${docker_run} ${ci_lint}  ./tests/scripts/task_lint.sh",
-            label: 'Run lint',
-          )
-          sh(
-            script: "${docker_run} ${ci_lint}  ./tests/scripts/unity/task_extra_lint.sh",
-            label: 'Run extra lint',
-          )
         }
       }
     }
diff --git a/tests/scripts/unity/task_extra_lint.sh b/tests/scripts/unity/task_extra_lint.sh
deleted file mode 100755
index 989f4df7389e..000000000000
--- a/tests/scripts/unity/task_extra_lint.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-set -euxo pipefail
-
-source tests/scripts/setup-pytest-env.sh
-
-# place extra lint here.

From f19d46a54f5d552a498adb16ec8f028c169d5906 Mon Sep 17 00:00:00 2001
From: Eric Lunderberg <elunderberg@octoml.ai>
Date: Tue, 16 Jul 2024 08:28:59 -0500
Subject: [PATCH 2/2] Revert the task_extra_lint.sh removal

---
 tests/scripts/unity/task_extra_lint.sh | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100755 tests/scripts/unity/task_extra_lint.sh

diff --git a/tests/scripts/unity/task_extra_lint.sh b/tests/scripts/unity/task_extra_lint.sh
new file mode 100755
index 000000000000..989f4df7389e
--- /dev/null
+++ b/tests/scripts/unity/task_extra_lint.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+set -euxo pipefail
+
+source tests/scripts/setup-pytest-env.sh
+
+# place extra lint here.