fix: fix br & lightning job name (#3016)

### **User description** fix br & lightning job name ___ ### **PR Type** Bug fix, Enhancement ___ ### **Description** - Fixed the script paths for BR and Lightning integration test jobs in Groovy files. - Removed `artifactVerify` parameter from `fetchAndExtractArtifact` calls in the `pull_check2.groovy` file. - Removed debug and v2 pod configuration files. - Fixed job names, contexts, triggers, and rerun commands for BR and Lightning integration tests in the presubmits YAML file. ___ ### **Changes walkthrough** 📝 <table><thead><tr><th></th><th align="left">Relevant files</th></tr></thead><tbody><tr><td><strong>Bug fix </strong></td><td><table> <tr> <td> <details> <summary><strong>pull_integration_br_test.groovy</strong><dd><code>Fix script path for BR integration test job</code>                            </dd></summary> <hr> jobs/pingcap/tidb/release-8.2/pull_integration_br_test.groovy - Fixed the script path for the BR integration test job. </details> </td> <td><a href="https://github.com/PingCAP-QE/ci/pull/3016/files#diff-81f8dd4fafb51cad0effa106ece4d7025f4adc34ca6134daa2a0e0a3063efdac">+1/-1</a>      </td> </tr> <tr> <td> <details> <summary><strong>pull_integration_lightning_test.groovy</strong><dd><code>Fix script path for Lightning integration test job</code>              </dd></summary> <hr> jobs/pingcap/tidb/release-8.2/pull_integration_lightning_test.groovy - Fixed the script path for the Lightning integration test job. </details> </td> <td><a href="https://github.com/PingCAP-QE/ci/pull/3016/files#diff-0d603139213abd080730935ca8688f146ee74319f1468db5eef17c7b7f8bcfde">+1/-1</a>      </td> </tr> <tr> <td> <details> <summary><strong>release-8.2-presubmits.yaml</strong><dd><code>Fix job names and contexts for BR and Lightning integration tests</code></dd></summary> <hr> prow-jobs/pingcap/tidb/release-8.2-presubmits.yaml <li>Fixed job names and contexts for BR and Lightning integration tests.<br> <li> Adjusted job triggers and rerun commands.<br> </details> </td> <td><a href="https://github.com/PingCAP-QE/ci/pull/3016/files#diff-6b7a142781e2dac4873adbff7433d5d0218d143d21fc9c6194c0c3a3b42fd2bb">+24/-22</a>  </td> </tr> </table></td></tr><tr><td><strong>Enhancement </strong></td><td><table> <tr> <td> <details> <summary><strong>pull_check2.groovy</strong><dd><code>Remove artifactVerify parameter from fetchAndExtractArtifact calls</code></dd></summary> <hr> pipelines/pingcap/tidb/release-8.2/pull_check2.groovy <li>Removed <code>artifactVerify</code> parameter from <code>fetchAndExtractArtifact</code> calls.<br> </details> </td> <td><a href="https://github.com/PingCAP-QE/ci/pull/3016/files#diff-36b79bfdc97468ed652103e48f1c087f194942c33313b4f636ac598ef85c28fe">+2/-2</a>      </td> </tr> <tr> <td> <details> <summary><strong>pod-pull_check2_debug.yaml</strong><dd><code>Remove debug pod configuration file</code>                                            </dd></summary> <hr> pipelines/pingcap/tidb/release-8.2/pod-pull_check2_debug.yaml - Removed the debug pod configuration file. </details> </td> <td><a href="https://github.com/PingCAP-QE/ci/pull/3016/files#diff-e7205a332e8c768032c48581b6880b090c522bd412c69e5d9177a4c35edf316a">+0/-91</a>    </td> </tr> <tr> <td> <details> <summary><strong>pod-pull_check2_v2.yaml</strong><dd><code>Remove v2 pod configuration file</code>                                                  </dd></summary> <hr> pipelines/pingcap/tidb/release-8.2/pod-pull_check2_v2.yaml - Removed the v2 pod configuration file. </details> </td> <td><a href="https://github.com/PingCAP-QE/ci/pull/3016/files#diff-18eaddf673fd0505f4add8e776a1d39aba5959da6652c22cc8b0a1f3de3359d3">+0/-65</a>    </td> </tr> </table></td></tr></tr></tbody></table> ___ > 💡 **PR-Agent usage**: >Comment `/help` on the PR to get a list of all available PR-Agent tools and their descriptions
PingCAP-QE · Jun 26, 2024 · f2e8a8d · f2e8a8d
1 parent 54d33f8
commit f2e8a8d
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 182 deletions.
diff --git a/jobs/pingcap/tidb/release-8.2/pull_integration_br_test.groovy b/jobs/pingcap/tidb/release-8.2/pull_integration_br_test.groovy
@@ -16,7 +16,7 @@ pipelineJob('pingcap/tidb/release-8.2/pull_br_integration_test') {
     definition {
         cpsScm {
             lightweight(true)
-            scriptPath("pipelines/pingcap/tidb/release-8.2/pull_br_integration_test.groovy")
+            scriptPath("pipelines/pingcap/tidb/release-8.2/pull_integration_br_test.groovy")
             scm {
                 git{
                     remote {

diff --git a/jobs/pingcap/tidb/release-8.2/pull_integration_lightning_test.groovy b/jobs/pingcap/tidb/release-8.2/pull_integration_lightning_test.groovy
@@ -16,7 +16,7 @@ pipelineJob('pingcap/tidb/release-8.2/pull_lightning_integration_test') {
     definition {
         cpsScm {
             lightweight(true)
-            scriptPath("pipelines/pingcap/tidb/release-8.2/pull_lightning_integration_test.groovy")
+            scriptPath("pipelines/pingcap/tidb/release-8.2/pull_integration_lightning_test.groovy")
             scm {
                 git{
                     remote {

diff --git a/pipelines/pingcap/tidb/release-8.2/pod-pull_check2_debug.yaml b/pipelines/pingcap/tidb/release-8.2/pod-pull_check2_debug.yaml
diff --git a/pipelines/pingcap/tidb/release-8.2/pod-pull_check2_v2.yaml b/pipelines/pingcap/tidb/release-8.2/pod-pull_check2_v2.yaml
diff --git a/pipelines/pingcap/tidb/release-8.2/pull_check2.groovy b/pipelines/pingcap/tidb/release-8.2/pull_check2.groovy
@@ -61,8 +61,8 @@ pipeline {
                         sh label: 'tidb-server', script: 'ls bin/tidb-server || make server'
                     }
                     script {
-                         component.fetchAndExtractArtifact(FILE_SERVER_URL, 'tikv', REFS.base_ref, REFS.pulls[0].title, 'centos7/tikv-server.tar.gz', 'bin', trunkBranch="master", artifactVerify=true)
-                         component.fetchAndExtractArtifact(FILE_SERVER_URL, 'pd', REFS.base_ref, REFS.pulls[0].title, 'centos7/pd-server.tar.gz', 'bin', trunkBranch="master", artifactVerify=true)
+                         component.fetchAndExtractArtifact(FILE_SERVER_URL, 'tikv', REFS.base_ref, REFS.pulls[0].title, 'centos7/tikv-server.tar.gz', 'bin')
+                         component.fetchAndExtractArtifact(FILE_SERVER_URL, 'pd', REFS.base_ref, REFS.pulls[0].title, 'centos7/pd-server.tar.gz', 'bin')
                     }
                     // cache it for other pods
                     cache(path: "./", includes: '**/*', key: "ws/${BUILD_TAG}") {

diff --git a/prow-jobs/pingcap/tidb/release-8.2-presubmits.yaml b/prow-jobs/pingcap/tidb/release-8.2-presubmits.yaml
@@ -46,46 +46,48 @@ presubmits:
       rerun_command: "/test unit-test"
       branches:
         - ^release-8\.2(\.\d+)?(-\d+)?(-v[\.\d]+)?$
-    - name: pingcap/tidb/release-8.2/pull_integration_ddl_test
+    - name: pingcap/tidb/release-8.2/pull_br_integration_test
       agent: jenkins
       decorate: false # need add this.
-      skip_if_only_changed: "(\\.(md|png|jpeg|jpg|gif|svg|pdf)|Dockerfile|OWNERS|OWNERS_ALIASES)$"
-      context: pull-integration-ddl-test
+      context: pull-br-integration-test
+      always_run: false
+      optional: true
       skip_report: false
-      trigger: "(?m)^/test (?:.*? )?pull-integration-ddl-test(?: .*?)?$"
-      rerun_command: "/test pull-integration-ddl-test"
+      trigger: "(?m)^/test (?:.*? )?pull-br-integration-test(?: .*?)?$"
+      rerun_command: "/test pull-br-integration-test"
       branches:
         - ^release-8\.2(\.\d+)?(-\d+)?(-v[\.\d]+)?$
-    - name: pingcap/tidb/release-8.2/pull_mysql_client_test
+    - name: pingcap/tidb/release-8.2/pull_lightning_integration_test
       agent: jenkins
       decorate: false # need add this.
-      skip_if_only_changed: "(\\.(md|png|jpeg|jpg|gif|svg|pdf)|Dockerfile|OWNERS|OWNERS_ALIASES)$"
-      context: pull-mysql-client-test
+      context: pull-lightning-integration-test
+      always_run: false
+      optional: true
       skip_report: false
-      trigger: "(?m)^/test (?:.*? )?pull-mysql-client-test(?: .*?)?$"
-      rerun_command: "/test pull-mysql-client-test"
+      trigger: "(?m)^/test (?:.*? )?pull-lightning-integration-test(?: .*?)?$"
+      rerun_command: "/test pull-lightning-integration-test"
       branches:
         - ^release-8\.2(\.\d+)?(-\d+)?(-v[\.\d]+)?$
-    - name: pingcap/tidb/release-8.2/pull_br_integration_test
+    - name: pingcap/tidb/release-8.2/pull_integration_ddl_test
       agent: jenkins
       decorate: false # need add this.
-      context: pull-br-integration-test
-      run_if_changed: "br/.*"
-      optional: false
+      always_run: false
+      optional: true
+      context: pull-integration-ddl-test
       skip_report: false
-      trigger: "(?m)^/test (?:.*? )?pull-br-integration-test(?: .*?)?$"
-      rerun_command: "/test pull-br-integration-test"
+      trigger: "(?m)^/test (?:.*? )?pull-integration-ddl-test(?: .*?)?$"
+      rerun_command: "/test pull-integration-ddl-test"
       branches:
         - ^release-8\.2(\.\d+)?(-\d+)?(-v[\.\d]+)?$
-    - name: pingcap/tidb/release-8.2/pull_lightning_integration_test
+    - name: pingcap/tidb/release-8.2/pull_mysql_client_test
       agent: jenkins
       decorate: false # need add this.
-      context: pull-lightning-integration-test
-      run_if_changed: "(lightning|br/pkg/(checksum|httputil|membuf|pdutil|restore/split|storage))/.*"
-      optional: false
+      always_run: false
+      optional: true
+      context: pull-mysql-client-test
       skip_report: false
-      trigger: "(?m)^/test (?:.*? )?pull-lightning-integration-test(?: .*?)?$"
-      rerun_command: "/test pull-lightning-integration-test"
+      trigger: "(?m)^/test (?:.*? )?pull-mysql-client-test(?: .*?)?$"
+      rerun_command: "/test pull-mysql-client-test"
       branches:
         - ^release-8\.2(\.\d+)?(-\d+)?(-v[\.\d]+)?$
     - name: pingcap/tidb/release-8.2/pull_integration_mysql_test