From 353a5b2e2a8c15813c084ba000ef9ae1bb29d93b Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Thu, 13 Jun 2024 18:46:47 +0800 Subject: [PATCH 1/2] fix(ti-community-infra/prow): fix image building jobs Signed-off-by: wuhuizuo --- prow-jobs/ti-community-infra/prow/postsubmits.yaml | 6 +++--- prow-jobs/ti-community-infra/prow/presubmits.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/prow-jobs/ti-community-infra/prow/postsubmits.yaml b/prow-jobs/ti-community-infra/prow/postsubmits.yaml index db1326be0..61a310ef9 100644 --- a/prow-jobs/ti-community-infra/prow/postsubmits.yaml +++ b/prow-jobs/ti-community-infra/prow/postsubmits.yaml @@ -2,13 +2,13 @@ postsubmits: ti-community-infra/prow: - name: push-prow-images # 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)|gencred|prow|ghproxy|label_sync/.+\.go|robots/commenter|robots/pr-creator|robots/issue-creator|testgrid/cmd|gcsweb)' + run_if_changed: '^(\.ko\.yaml|hack/(make-rules|prowimagebuilder))|.+\.go' decorate: true branches: - ^release$ max_concurrency: 1 spec: - serviceAccountName: pusher + serviceAccountName: prow-pusher containers: - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240515-17c6d50e24-test-infra command: @@ -23,7 +23,7 @@ postsubmits: privileged: true resources: requests: - cpu: "4" + cpu: "1" 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 1eeaa3542..1be6fbb47 100644 --- a/prow-jobs/ti-community-infra/prow/presubmits.yaml +++ b/prow-jobs/ti-community-infra/prow/presubmits.yaml @@ -22,15 +22,15 @@ presubmits: # 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: - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240515-17c6d50e24-test-infra command: - runner.sh args: - make - - -C - - prow - build-images + - REGISTRY=ticommunityinfra # docker-in-docker needs privileged mode securityContext: privileged: true @@ -38,7 +38,7 @@ presubmits: requests: # This job is very CPU intensive as building prow images in # parallel - cpu: "4" + cpu: "1" - name: pull-verify branches: - ^master$ From f6bf8a03d4602fc0326c593037008fb520c71642 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Thu, 13 Jun 2024 18:48:34 +0800 Subject: [PATCH 2/2] Update prow-jobs/ti-community-infra/prow/postsubmits.yaml --- prow-jobs/ti-community-infra/prow/postsubmits.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prow-jobs/ti-community-infra/prow/postsubmits.yaml b/prow-jobs/ti-community-infra/prow/postsubmits.yaml index 61a310ef9..373bcd416 100644 --- a/prow-jobs/ti-community-infra/prow/postsubmits.yaml +++ b/prow-jobs/ti-community-infra/prow/postsubmits.yaml @@ -2,7 +2,7 @@ postsubmits: ti-community-infra/prow: - name: push-prow-images # 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' + run_if_changed: '^(\.ko\.yaml|hack/(make-rules|prowimagebuilder)|.+\.go)' decorate: true branches: - ^release$