From fd582eeabb3778c6a8ab312152c3c713a47170ef Mon Sep 17 00:00:00 2001 From: Eric Lunderberg Date: Fri, 12 Jul 2024 12:57:48 -0500 Subject: [PATCH] [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 | 58 -------------------------- tests/scripts/unity/task_extra_lint.sh | 23 ---------- 2 files changed, 81 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 b9047e8b6f646..9765ce9a7e415 --- a/ci/jenkins/unity_jenkinsfile.groovy +++ b/ci/jenkins/unity_jenkinsfile.groovy @@ -171,64 +171,6 @@ def should_skip_ci(pr_number) { cancel_previous_build() -def lint(node_type) { - stage('Prepare') { - node(node_type) { - // When something is provided in ci_*_param, use it, otherwise default with ci_* - ci_lint = params.ci_lint_param ?: ci_lint - ci_cpu = params.ci_cpu_param ?: ci_cpu - ci_gpu = params.ci_gpu_param ?: ci_gpu - ci_wasm = params.ci_wasm_param ?: ci_wasm - ci_i386 = params.ci_i386_param ?: ci_i386 - ci_qemu = params.ci_qemu_param ?: ci_qemu - ci_arm = params.ci_arm_param ?: ci_arm - ci_hexagon = params.ci_hexagon_param ?: ci_hexagon - - sh(script: """ - echo "Docker images being used in this build:" - echo " ci_lint = ${ci_lint}" - echo " ci_cpu = ${ci_cpu}" - echo " ci_gpu = ${ci_gpu}" - echo " ci_wasm = ${ci_wasm}" - echo " ci_i386 = ${ci_i386}" - echo " ci_qemu = ${ci_qemu}" - echo " ci_arm = ${ci_arm}" - echo " ci_hexagon = ${ci_hexagon}" - """, label: 'Docker image names') - } - } - - stage('Sanity Check') { - timeout(time: max_time, unit: 'MINUTES') { - node(node_type) { - ws(per_exec_ws('tvm/sanity')) { - init_git() - is_docs_only_build = sh( - returnStatus: true, - script: './tests/scripts/git_change_docs.sh', - label: 'Check for docs only changes', - ) - 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', - ) - } - } - } - } -} - -try { - lint('CPU-SMALL-SPOT') -} catch (Exception ex) { - lint('CPU-SMALL') -} // Run make. First try to do an incremental make from a previous workspace in hope to // accelerate the compilation. If something is wrong, clean the workspace and then diff --git a/tests/scripts/unity/task_extra_lint.sh b/tests/scripts/unity/task_extra_lint.sh deleted file mode 100755 index 989f4df7389ed..0000000000000 --- 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.