feat: switch to use new pipeline trigger by prow in branch 8.1 (#3116)

Swtich to use new pipeline trigger by prow in tikv & tiflash branch release-8.1
PingCAP-QE · Sep 10, 2024 · 47fa00a · 47fa00a
1 parent a57e3a0
commit 47fa00a
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 16 deletions.
diff --git a/jenkins/jobs/ci/tiflash/ghpr_build.groovy b/jenkins/jobs/ci/tiflash/ghpr_build.groovy
@@ -56,6 +56,7 @@ pipelineJob('tiflash-ghpr-build') {
                     orgslist('pingcap')
                     blackListTargetBranches {
                         ghprbBranch { branch('master') }
+                        ghprbBranch { branch('release-8.1') }
                         ghprbBranch { branch('release-8.2') }
                         ghprbBranch { branch('release-8.3') }
                     }

diff --git a/jenkins/jobs/ci/tiflash/ghpr_integration_test.groovy b/jenkins/jobs/ci/tiflash/ghpr_integration_test.groovy
@@ -60,6 +60,7 @@ pipelineJob('tiflash-ghpr-integration-tests') {
                     orgslist('pingcap')
                     blackListTargetBranches {
                         ghprbBranch { branch('master') }
+                        ghprbBranch { branch('release-8.1') }
                         ghprbBranch { branch('release-8.2') }
                         ghprbBranch { branch('release-8.3') }
                     }

diff --git a/jenkins/jobs/ci/tiflash/ghpr_unit_test.groovy b/jenkins/jobs/ci/tiflash/ghpr_unit_test.groovy
@@ -44,6 +44,7 @@ pipelineJob('tiflash-ghpr-unit-tests') {
                     orgslist('pingcap')
                     blackListTargetBranches {
                         ghprbBranch { branch('master') }
+                        ghprbBranch { branch('release-8.1') }
                         ghprbBranch { branch('release-8.2') }
                         ghprbBranch { branch('release-8.3') }
                     }

diff --git a/jenkins/jobs/ci/tikv/tikv/ghpr_test.groovy b/jenkins/jobs/ci/tikv/tikv/ghpr_test.groovy
@@ -32,6 +32,7 @@ pipelineJob('tikv_ghpr_test') {
                     orgslist('pingcap tikv')
                     blackListTargetBranches {
                         ghprbBranch { branch('master') }
+                        ghprbBranch { branch('release-8.1') }
                         ghprbBranch { branch('release-8.2') }
                         ghprbBranch { branch('release-8.3') }
                     }

diff --git a/prow-jobs/pingcap/tiflash/release-8.1-presubmits.yaml b/prow-jobs/pingcap/tiflash/release-8.1-presubmits.yaml
@@ -9,22 +9,20 @@ presubmits:
     - name: pingcap/tiflash/release-8.1/pull_unit_test
       agent: jenkins
       decorate: false # need add this.
-      # skip_if_only_changed: *skip_if_only_changed
-      always_run: false
-      context: wip/pull-unit-test
-      skip_report: true
-      optional: true
+      skip_if_only_changed: *skip_if_only_changed
+      context: pull-unit-test
+      skip_report: false
+      optional: false
       trigger: "(?m)^/test (?:.*? )?(pull-unit-test)(?: .*?)?$"
       rerun_command: "/test pull-unit-test"
       branches: *branches
     - name: pingcap/tiflash/release-8.1/pull_integration_test
       agent: jenkins
       decorate: false # need add this.
-      # skip_if_only_changed: *skip_if_only_changed
-      always_run: false
-      context: wip/pull-integration-test
-      skip_report: true
-      optional: true
+      skip_if_only_changed: *skip_if_only_changed
+      context: pull-integration-test
+      skip_report: false
+      optional: false
       trigger: "(?m)^/test (?:.*? )?(pull-integration-test)(?: .*?)?$"
       rerun_command: "/test pull-integration-test"
       branches: *branches
diff --git a/prow-jobs/tikv/tikv/release-8.1-presubmits.yaml b/prow-jobs/tikv/tikv/release-8.1-presubmits.yaml
@@ -8,12 +8,12 @@ presubmits:
     - name: tikv/tikv/release-8.1/pull_unit_test
       agent: jenkins
       decorate: false # need add this.
-      always_run: false # update here after test passed
-      optional: true # update here after test passed
-      skip_report: true # update here after test passed
-      context: wip/pull-unit-test
-      trigger: "(?m)^/debug (?:.*? )?pull-unit-test(?: .*?)?$"
-      rerun_command: "/debug pull-unit-test"
+      always_run: true
+      optional: false
+      skip_report: false
+      context: pull-unit-test
+      trigger: "(?m)^/test (?:.*? )?pull-unit-test(?: .*?)?$"
+      rerun_command: "/test pull-unit-test"
       branches: *branches
     - name: tikv/tikv/release-8.1/pull_integration_test
       agent: jenkins