Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fix br & lightning job name #3016

Merged
merged 1 commit into from
Jun 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
91 changes: 0 additions & 91 deletions pipelines/pingcap/tidb/release-8.2/pod-pull_check2_debug.yaml

This file was deleted.

65 changes: 0 additions & 65 deletions pipelines/pingcap/tidb/release-8.2/pod-pull_check2_v2.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions pipelines/pingcap/tidb/release-8.2/pull_check2.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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}") {
Expand Down
46 changes: 24 additions & 22 deletions prow-jobs/pingcap/tidb/release-8.2-presubmits.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down