From 91e5da829021e3865369dfdeb80270c353ef3662 Mon Sep 17 00:00:00 2001 From: purelind Date: Wed, 26 Jun 2024 16:15:02 +0800 Subject: [PATCH] fix br & lightning job name --- .../pull_integration_br_test.groovy | 2 +- .../pull_integration_lightning_test.groovy | 2 +- .../release-8.2/pod-pull_check2_debug.yaml | 91 ------------------- .../tidb/release-8.2/pod-pull_check2_v2.yaml | 65 ------------- .../tidb/release-8.2/pull_check2.groovy | 4 +- .../pingcap/tidb/release-8.2-presubmits.yaml | 46 +++++----- 6 files changed, 28 insertions(+), 182 deletions(-) delete mode 100644 pipelines/pingcap/tidb/release-8.2/pod-pull_check2_debug.yaml delete mode 100644 pipelines/pingcap/tidb/release-8.2/pod-pull_check2_v2.yaml 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 index acd6f5c241..8a1d83b781 100644 --- 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 index 17abc18c3d..942f8a7683 100644 --- 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 deleted file mode 100644 index 1aac6cb9c3..0000000000 --- a/pipelines/pingcap/tidb/release-8.2/pod-pull_check2_debug.yaml +++ /dev/null @@ -1,91 +0,0 @@ -apiVersion: v1 -kind: Pod -spec: - securityContext: - fsGroup: 1000 - containers: - - name: golang - image: "hub.pingcap.net/wangweizhen/tidb_image:go12120230809" - securityContext: - privileged: true - tty: true - resources: - limits: - memory: 32Gi - cpu: "8" - volumeMounts: - - mountPath: /home/jenkins/.tidb/tmp - name: bazel-out-merged - - name: bazel-out-lower - subPath: tidb/go1.19.2 - mountPath: /bazel-out-lower - - name: bazel-out-overlay - mountPath: /bazel-out-overlay - - name: bazel-rc - mountPath: /data/ - readOnly: true - - name: containerinfo - mountPath: /etc/containerinfo - lifecycle: - postStart: - exec: - command: - - /bin/sh - - /data/bazel-prepare-in-container.sh - - name: net-tool - image: hub.pingcap.net/jenkins/network-multitool - tty: true - resources: - limits: - memory: 128Mi - cpu: 100m - - name: report - image: hub.pingcap.net/jenkins/python3-requests:latest - tty: true - resources: - limits: - memory: 256Mi - cpu: 100m - volumes: - - name: bazel-out-lower - persistentVolumeClaim: - claimName: bazel-out-data - - name: bazel-out-overlay - emptyDir: {} - - name: bazel-out-merged - emptyDir: {} - - name: bazel-rc - secret: - secretName: bazel - - name: containerinfo - downwardAPI: - items: - - path: cpu_limit - resourceFieldRef: - containerName: golang - resource: limits.cpu - - path: cpu_request - resourceFieldRef: - containerName: golang - resource: requests.cpu - - path: mem_limit - resourceFieldRef: - containerName: golang - resource: limits.memory - - path: mem_request - resourceFieldRef: - containerName: golang - resource: requests.memory - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: kubernetes.io/arch - operator: In - values: - - amd64 - - key: ci-nvme-high-performance - operator: In - values: - - "true" 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 deleted file mode 100644 index 50c0a21b43..0000000000 --- a/pipelines/pingcap/tidb/release-8.2/pod-pull_check2_v2.yaml +++ /dev/null @@ -1,65 +0,0 @@ -apiVersion: v1 -kind: Pod -spec: - securityContext: - runAsUser: 0 - containers: - - name: golang - image: "hub.pingcap.net/wangweizhen/tidb_image:go12120230809" - securityContext: - privileged: true - tty: true - resources: - limits: - memory: 32Gi - cpu: "8" - volumeMounts: - - name: containerinfo - mountPath: /etc/containerinfo - - name: net-tool - image: hub.pingcap.net/jenkins/network-multitool - tty: true - resources: - limits: - memory: 128Mi - cpu: 100m - - name: report - image: hub.pingcap.net/jenkins/python3-requests:latest - tty: true - resources: - limits: - memory: 256Mi - cpu: 100m - volumes: - - name: containerinfo - downwardAPI: - items: - - path: cpu_limit - resourceFieldRef: - containerName: golang - resource: limits.cpu - - path: cpu_request - resourceFieldRef: - containerName: golang - resource: requests.cpu - - path: mem_limit - resourceFieldRef: - containerName: golang - resource: limits.memory - - path: mem_request - resourceFieldRef: - containerName: golang - resource: requests.memory - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: kubernetes.io/arch - operator: In - values: - - amd64 - - key: ci-nvme-high-performance - operator: In - values: - - "true" diff --git a/pipelines/pingcap/tidb/release-8.2/pull_check2.groovy b/pipelines/pingcap/tidb/release-8.2/pull_check2.groovy index 1e0c291822..a12b36682c 100644 --- 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 index 0f5f095e12..f6163d791e 100644 --- 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