From fceec7fff4483a4c904a98fb64fc4ec5ca82aabe Mon Sep 17 00:00:00 2001 From: Aaron Crickenberger Date: Fri, 24 Sep 2021 06:29:32 -0700 Subject: [PATCH 1/2] config/jobs: use k8s-staging-test-infra/bazelbuild --- .../jobs/kubernetes/test-infra/test-infra-trusted.yaml | 10 +++++----- prow/life_of_a_prow_job.md | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/jobs/kubernetes/test-infra/test-infra-trusted.yaml b/config/jobs/kubernetes/test-infra/test-infra-trusted.yaml index 065bb0b34752..46d1d80e442c 100644 --- a/config/jobs/kubernetes/test-infra/test-infra-trusted.yaml +++ b/config/jobs/kubernetes/test-infra/test-infra-trusted.yaml @@ -179,7 +179,7 @@ postsubmits: spec: serviceAccountName: pusher containers: - - image: gcr.io/k8s-testimages/bazelbuild:v20210917-12df099-test-infra + - image: gcr.io/k8s-staging-test-infra/bazelbuild:v20210917-12df099d55-test-infra command: - prow/push.sh tolerations: @@ -433,7 +433,7 @@ postsubmits: spec: serviceAccountName: testgrid-config-updater containers: - - image: gcr.io/k8s-testimages/bazelbuild:v20210917-12df099-test-infra + - image: gcr.io/k8s-staging-test-infra/bazelbuild:v20210917-12df099d55-test-infra command: - ./testgrid/config-upload.sh resources: @@ -455,7 +455,7 @@ postsubmits: spec: serviceAccountName: deployer # TODO(fejta): should be pusher containers: - - image: gcr.io/k8s-testimages/bazelbuild:v20210917-12df099-test-infra + - image: gcr.io/k8s-staging-test-infra/bazelbuild:v20210917-12df099d55-test-infra command: - ./boskos/update_prow_config.sh annotations: @@ -571,7 +571,7 @@ periodics: base_ref: master spec: containers: - - image: gcr.io/k8s-testimages/bazelbuild:v20210917-12df099-test-infra + - image: gcr.io/k8s-staging-test-infra/bazelbuild:v20210917-12df099d55-test-infra command: - hack/autodeps.sh args: @@ -608,7 +608,7 @@ periodics: base_ref: master spec: containers: - - image: gcr.io/k8s-testimages/bazelbuild:v20210917-12df099-test-infra + - image: gcr.io/k8s-staging-test-infra/bazelbuild:v20210917-12df099d55-test-infra command: - hack/autodeps.sh args: diff --git a/prow/life_of_a_prow_job.md b/prow/life_of_a_prow_job.md index 1403a3722939..1cb0b3127f27 100644 --- a/prow/life_of_a_prow_job.md +++ b/prow/life_of_a_prow_job.md @@ -63,7 +63,7 @@ spec: decorate: true pod_spec: containers: - - image: gcr.io/k8s-testimages/bazelbuild:0.11 + - image: gcr.io/k8s-staging-test-infra/bazelbuild:latest-test-infra refs: base_ref: master base_sha: 064678510782db5b382df478bb374aaa32e577ea From 13b2261a1adc30d3f11cf5c7dedcc65c3aed8871 Mon Sep 17 00:00:00 2001 From: Aaron Crickenberger Date: Fri, 24 Sep 2021 06:31:08 -0700 Subject: [PATCH 2/2] config/jobs: use k8s-staging-test-infra/benchmarkjunit --- .../structured-merge-diff/structured-merge-diff-ci.yaml | 2 +- .../structured-merge-diff/structured-merge-diff-presubmits.yaml | 2 +- .../sig-scalability/sig-scalability-periodic-jobs.yaml | 2 +- config/jobs/kubernetes/test-infra/test-infra-canaries.yaml | 2 +- pkg/benchmarkjunit/prowjob_example.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/jobs/kubernetes-sigs/structured-merge-diff/structured-merge-diff-ci.yaml b/config/jobs/kubernetes-sigs/structured-merge-diff/structured-merge-diff-ci.yaml index 7828b8359137..47f8604c236d 100644 --- a/config/jobs/kubernetes-sigs/structured-merge-diff/structured-merge-diff-ci.yaml +++ b/config/jobs/kubernetes-sigs/structured-merge-diff/structured-merge-diff-ci.yaml @@ -51,7 +51,7 @@ periodics: path_alias: sigs.k8s.io/structured-merge-diff spec: containers: - - image: gcr.io/k8s-testimages/benchmarkjunit:latest + - image: gcr.io/k8s-staging-test-infra/benchmarkjunit:latest command: - /benchmarkjunit args: diff --git a/config/jobs/kubernetes-sigs/structured-merge-diff/structured-merge-diff-presubmits.yaml b/config/jobs/kubernetes-sigs/structured-merge-diff/structured-merge-diff-presubmits.yaml index 2f2068f990dd..80b07bd70c8e 100644 --- a/config/jobs/kubernetes-sigs/structured-merge-diff/structured-merge-diff-presubmits.yaml +++ b/config/jobs/kubernetes-sigs/structured-merge-diff/structured-merge-diff-presubmits.yaml @@ -43,7 +43,7 @@ presubmits: path_alias: sigs.k8s.io/structured-merge-diff spec: containers: - - image: gcr.io/k8s-testimages/benchmarkjunit:latest + - image: gcr.io/k8s-staging-test-infra/benchmarkjunit:latest command: - /benchmarkjunit args: diff --git a/config/jobs/kubernetes/sig-scalability/sig-scalability-periodic-jobs.yaml b/config/jobs/kubernetes/sig-scalability/sig-scalability-periodic-jobs.yaml index df7fd67c6a16..51b44f578d98 100644 --- a/config/jobs/kubernetes/sig-scalability/sig-scalability-periodic-jobs.yaml +++ b/config/jobs/kubernetes/sig-scalability/sig-scalability-periodic-jobs.yaml @@ -904,7 +904,7 @@ periodics: path_alias: k8s.io/kubernetes spec: containers: - - image: gcr.io/k8s-testimages/benchmarkjunit:latest + - image: gcr.io/k8s-staging-test-infra/benchmarkjunit:latest command: - /benchmarkjunit args: diff --git a/config/jobs/kubernetes/test-infra/test-infra-canaries.yaml b/config/jobs/kubernetes/test-infra/test-infra-canaries.yaml index c03dc33f9097..bfb797abe0a4 100644 --- a/config/jobs/kubernetes/test-infra/test-infra-canaries.yaml +++ b/config/jobs/kubernetes/test-infra/test-infra-canaries.yaml @@ -21,7 +21,7 @@ periodics: path_alias: k8s.io/test-infra spec: containers: - - image: gcr.io/k8s-testimages/benchmarkjunit:latest + - image: gcr.io/k8s-staging-test-infra/benchmarkjunit:latest command: - /benchmarkjunit args: diff --git a/pkg/benchmarkjunit/prowjob_example.yaml b/pkg/benchmarkjunit/prowjob_example.yaml index 98fb28991c68..7019bc0b64f2 100644 --- a/pkg/benchmarkjunit/prowjob_example.yaml +++ b/pkg/benchmarkjunit/prowjob_example.yaml @@ -9,7 +9,7 @@ periodics: path_alias: k8s.io/test-infra spec: containers: - - image: gcr.io/k8s-testimages/benchmarkjunit:latest + - image: gcr.io/k8s-staging-test-infra/benchmarkjunit:latest command: - /benchmarkjunit args: