From fca6e2ecf0a947a6b6f3b3844aceb78c33974c91 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Wed, 9 Oct 2024 14:16:08 -0400 Subject: [PATCH] Switch logs destination from kubernetes-jenkins to kubernetes-ci-logs Signed-off-by: Davanum Srinivas --- config/prow/config.yaml | 4 ++-- config/tests/jobs/jobs_test.go | 2 +- images/bigquery/runner | 2 +- images/bootstrap/entrypoint.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/prow/config.yaml b/config/prow/config.yaml index ca5450351bfd..6a22519119a5 100644 --- a/config/prow/config.yaml +++ b/config/prow/config.yaml @@ -1,5 +1,5 @@ plank: - job_url_template: 'https://prow.k8s.io/view/gs/kubernetes-jenkins/{{if eq .Spec.Type "presubmit"}}pr-logs/pull{{else if eq .Spec.Type "batch"}}pr-logs/pull{{else}}logs{{end}}{{if .Spec.Refs}}{{if ne .Spec.Refs.Org ""}}{{if ne .Spec.Refs.Org "kubernetes"}}/{{if and (eq .Spec.Refs.Org "kubernetes-sigs") (ne .Spec.Refs.Repo "poseidon")}}sigs.k8s.io{{else}}{{.Spec.Refs.Org}}{{end}}_{{.Spec.Refs.Repo}}{{else if ne .Spec.Refs.Repo "kubernetes"}}/{{.Spec.Refs.Repo}}{{end}}{{end}}{{end}}{{if eq .Spec.Type "presubmit"}}/{{with index .Spec.Refs.Pulls 0}}{{.Number}}{{end}}{{else if eq .Spec.Type "batch"}}/batch{{end}}/{{.Spec.Job}}/{{.Status.BuildID}}/' + job_url_template: 'https://prow.k8s.io/view/gs/kubernetes-ci-logs/{{if eq .Spec.Type "presubmit"}}pr-logs/pull{{else if eq .Spec.Type "batch"}}pr-logs/pull{{else}}logs{{end}}{{if .Spec.Refs}}{{if ne .Spec.Refs.Org ""}}{{if ne .Spec.Refs.Org "kubernetes"}}/{{if and (eq .Spec.Refs.Org "kubernetes-sigs") (ne .Spec.Refs.Repo "poseidon")}}sigs.k8s.io{{else}}{{.Spec.Refs.Org}}{{end}}_{{.Spec.Refs.Repo}}{{else if ne .Spec.Refs.Repo "kubernetes"}}/{{.Spec.Refs.Repo}}{{end}}{{end}}{{end}}{{if eq .Spec.Type "presubmit"}}/{{with index .Spec.Refs.Pulls 0}}{{.Number}}{{end}}{{else if eq .Spec.Type "batch"}}/batch{{end}}/{{.Spec.Job}}/{{.Status.BuildID}}/' report_templates: '*': '[Full PR test history](https://prow.k8s.io/pr-history?org={{.Spec.Refs.Org}}&repo={{.Spec.Refs.Repo}}&pr={{with index .Spec.Refs.Pulls 0}}{{.Number}}{{end}}). [Your PR dashboard](https://prow.k8s.io/pr?query=is%3Apr%20state%3Aopen%20author%3A{{with index .Spec.Refs.Pulls 0}}{{.Author}}{{end}}). Please help us cut down on flakes by [linking to](https://git.k8s.io/community/contributors/devel/sig-testing/flaky-tests.md#filing-issues-for-flaky-tests) an [open issue](https://github.com/{{.Spec.Refs.Org}}/{{.Spec.Refs.Repo}}/issues?q=is:issue+is:open) when you hit one in your PR.' job_url_prefix_config: @@ -18,7 +18,7 @@ plank: entrypoint: "us-docker.pkg.dev/k8s-infra-prow/images/entrypoint:v20240802-66b115076" sidecar: "us-docker.pkg.dev/k8s-infra-prow/images/sidecar:v20240802-66b115076" gcs_configuration: - bucket: "kubernetes-jenkins" + bucket: "kubernetes-ci-logs" path_strategy: "legacy" default_org: "kubernetes" default_repo: "kubernetes" diff --git a/config/tests/jobs/jobs_test.go b/config/tests/jobs/jobs_test.go index bf94173169d0..a4f743fd4f64 100644 --- a/config/tests/jobs/jobs_test.go +++ b/config/tests/jobs/jobs_test.go @@ -47,7 +47,7 @@ import ( var configPath = flag.String("config", "../../../config/prow/config.yaml", "Path to prow config") var jobConfigPath = flag.String("job-config", "../../jobs", "Path to prow job config") var deckPath = flag.String("deck-path", "https://prow.k8s.io", "Path to deck") -var bucket = flag.String("bucket", "kubernetes-jenkins", "Gcs bucket for log upload") +var bucket = flag.String("bucket", "kubernetes-ci-logs", "Gcs bucket for log upload") var k8sProw = flag.Bool("k8s-prow", true, "If the config is for k8s prow cluster") // Loaded at TestMain. diff --git a/images/bigquery/runner b/images/bigquery/runner index d8d4300739fa..d3628573887e 100755 --- a/images/bigquery/runner +++ b/images/bigquery/runner @@ -22,5 +22,5 @@ git clone https://github.com/kubernetes/test-infra --bare \ --job=${JOB_NAME} \ --service-account=${GOOGLE_APPLICATION_CREDENTIALS} \ - --upload="gs://kubernetes-jenkins/logs" \ + --upload="gs://kubernetes-ci-logs/logs" \ "$@" diff --git a/images/bootstrap/entrypoint.sh b/images/bootstrap/entrypoint.sh index dd5f810978ff..f6d08b3b8902 100755 --- a/images/bootstrap/entrypoint.sh +++ b/images/bootstrap/entrypoint.sh @@ -36,7 +36,7 @@ else popd >/dev/null fi -BOOTSTRAP_UPLOAD_BUCKET_PATH=${BOOTSTRAP_UPLOAD_BUCKET_PATH:-"gs://kubernetes-jenkins/logs"} +BOOTSTRAP_UPLOAD_BUCKET_PATH=${BOOTSTRAP_UPLOAD_BUCKET_PATH:-"gs://kubernetes-ci-logs/logs"} # actually start bootstrap and the job, under the runner (which handles dind etc.) /usr/local/bin/runner.sh \