From 5a4cecaa2bf9092d586c69aedeff555fbf7de2a7 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Fri, 14 Jun 2024 12:22:13 +0800 Subject: [PATCH] fix(ti-community-infra/prow): let the heavy job run in other cluster (#2998) Signed-off-by: wuhuizuo Signed-off-by: wuhuizuo --- OWNERS | 5 +---- OWNERS_ALIASES | 6 ++++++ jenkins/OWNERS | 6 +++--- jenkins/jobs/cd/OWNERS | 5 +---- jenkins/pipelines/cd/OWNERS | 4 +--- jobs/OWNERS | 4 +--- libraries/OWNERS | 4 +--- pipelines/OWNERS | 3 +-- prow-jobs/OWNERS | 4 +--- prow-jobs/ti-community-infra/prow/postsubmits.yaml | 3 ++- prow-jobs/ti-community-infra/prow/presubmits.yaml | 10 ++++++---- scripts/plugins/OWNERS | 5 ++--- staging/OWNERS | 4 ++-- 13 files changed, 28 insertions(+), 35 deletions(-) diff --git a/OWNERS b/OWNERS index 0cffa9821d..144e34aad9 100644 --- a/OWNERS +++ b/OWNERS @@ -1,6 +1,3 @@ # See the OWNERS docs at https://go.k8s.io/owners approvers: - - wuhuizuo - - purelind -emeritus_reviewers: - - lijie0123 + - sig-approvers-ee diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index 3df9c9e004..bb54288af9 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -7,3 +7,9 @@ aliases: - qiancai sig-approvers-tidb-tools: # approvers for CI scope of tidb-tools project. - Benjamin2037 + sig-approvers-ee: # approvers for engineering efficiency scopes. + - wuhuizuo + - purelind + + emeritus_reviewers: # emeritus reviewers will be keeped here, but will not be used. + - lijie0123 # ee reviewer diff --git a/jenkins/OWNERS b/jenkins/OWNERS index fcda7e102c..9186f0c0fb 100644 --- a/jenkins/OWNERS +++ b/jenkins/OWNERS @@ -1,4 +1,4 @@ -reviewers: - - wuhuizuo +labels: + - area/deprecated approvers: - - purelind + - sig-approvers-ee diff --git a/jenkins/jobs/cd/OWNERS b/jenkins/jobs/cd/OWNERS index f9e4013ae5..c1a1d6f976 100644 --- a/jenkins/jobs/cd/OWNERS +++ b/jenkins/jobs/cd/OWNERS @@ -1,5 +1,2 @@ approvers: - - wuhuizuo -reviewers: - - wuhuizuo - - purelind + - sig-approvers-ee diff --git a/jenkins/pipelines/cd/OWNERS b/jenkins/pipelines/cd/OWNERS index c33926570b..c1a1d6f976 100644 --- a/jenkins/pipelines/cd/OWNERS +++ b/jenkins/pipelines/cd/OWNERS @@ -1,4 +1,2 @@ -reviewers: - - purelind approvers: - - wuhuizuo + - sig-approvers-ee diff --git a/jobs/OWNERS b/jobs/OWNERS index 6604618ee6..b1a0eae58e 100644 --- a/jobs/OWNERS +++ b/jobs/OWNERS @@ -1,6 +1,4 @@ labels: - area/jobs/jenkins-DSL -reviewers: - - purelind approvers: - - wuhuizuo + - sig-approvers-ee diff --git a/libraries/OWNERS b/libraries/OWNERS index c33926570b..c1a1d6f976 100644 --- a/libraries/OWNERS +++ b/libraries/OWNERS @@ -1,4 +1,2 @@ -reviewers: - - purelind approvers: - - wuhuizuo + - sig-approvers-ee diff --git a/pipelines/OWNERS b/pipelines/OWNERS index c0090b3dd3..b81d912384 100644 --- a/pipelines/OWNERS +++ b/pipelines/OWNERS @@ -1,5 +1,4 @@ labels: - area/jenkins-pipelines approvers: - - wuhuizuo - - purelind + - sig-approvers-ee diff --git a/prow-jobs/OWNERS b/prow-jobs/OWNERS index 8911baf283..02a5e5ce0a 100644 --- a/prow-jobs/OWNERS +++ b/prow-jobs/OWNERS @@ -1,6 +1,4 @@ labels: - area/jobs/prow -reviewers: - - purelind approvers: - - wuhuizuo + - sig-approvers-ee diff --git a/prow-jobs/ti-community-infra/prow/postsubmits.yaml b/prow-jobs/ti-community-infra/prow/postsubmits.yaml index 373bcd4168..fa72039667 100644 --- a/prow-jobs/ti-community-infra/prow/postsubmits.yaml +++ b/prow-jobs/ti-community-infra/prow/postsubmits.yaml @@ -1,6 +1,7 @@ postsubmits: ti-community-infra/prow: - name: push-prow-images + cluster: gcp-prow-ksyun # Runs on more than just the Prow dir to include some additional images that we publish to gcr.io/k8s-prow. run_if_changed: '^(\.ko\.yaml|hack/(make-rules|prowimagebuilder)|.+\.go)' decorate: true @@ -23,7 +24,7 @@ postsubmits: privileged: true resources: requests: - cpu: "1" + cpu: "4" annotations: description: builds and pushes all prow on each commit by running make -C prow diff --git a/prow-jobs/ti-community-infra/prow/presubmits.yaml b/prow-jobs/ti-community-infra/prow/presubmits.yaml index 1be6fbb478..c7752cf1ce 100644 --- a/prow-jobs/ti-community-infra/prow/presubmits.yaml +++ b/prow-jobs/ti-community-infra/prow/presubmits.yaml @@ -6,6 +6,7 @@ presubmits: - ^release$ always_run: true decorate: true + clone_depth: 1 spec: containers: - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240515-17c6d50e24-test-infra @@ -15,12 +16,12 @@ presubmits: - make - test - name: pull-build-images + cluster: gcp-prow-ksyun + decorate: true + always_run: false branches: - ^master$ - ^release$ - always_run: false - # run_if_changed: '^(\.ko\.yaml|hack/(ts-rollup|make-rules|prowimagebuilder)|prow|ghproxy|label_sync/.+\.go|robots/commenter|robots/pr-creator|robots/issue-creator|testgrid/cmd|gcsweb)' - decorate: true spec: serviceAccountName: prow-pusher containers: @@ -38,13 +39,14 @@ presubmits: requests: # This job is very CPU intensive as building prow images in # parallel - cpu: "1" + cpu: "4" - name: pull-verify branches: - ^master$ - ^release$ always_run: true decorate: true + clone_depth: 1 spec: containers: - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240515-17c6d50e24-test-infra diff --git a/scripts/plugins/OWNERS b/scripts/plugins/OWNERS index c33926570b..edc15c333a 100644 --- a/scripts/plugins/OWNERS +++ b/scripts/plugins/OWNERS @@ -1,4 +1,3 @@ -reviewers: - - purelind approvers: - - wuhuizuo + - sig-approvers-ee + diff --git a/staging/OWNERS b/staging/OWNERS index 5eadfa15a0..c975d52385 100644 --- a/staging/OWNERS +++ b/staging/OWNERS @@ -1,4 +1,4 @@ # See the OWNERS docs at https://go.k8s.io/owners approvers: - - wuhuizuo - - purelind + - sig-approvers-ee +