Merge pull request #33495 from michelle192837/testgridmigrate

Migrate TestGrid locations to gs://kubernetes-ci-logs.
kubernetes · Sep 19, 2024 · 4041010 · 4041010
2 parents 0aeaeb0 + 3e8506a
commit 4041010
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 42 deletions.
diff --git a/config/testgrids/config.yaml b/config/testgrids/config.yaml
@@ -7,52 +7,52 @@
 # Start testgroups
 test_groups:
 - name: ci-cri-containerd-node-e2e-features
-  gcs_prefix: kubernetes-jenkins/logs/ci-cri-containerd-node-e2e-features
+  gcs_prefix: kubernetes-ci-logs/logs/ci-cri-containerd-node-e2e-features
   test_name_config:
     name_elements:
     - target_config: Tests name
     - target_config: Context
     name_format: '%s [%s]'
 - name: ci-cos-cgroupv1-containerd-node-e2e
-  gcs_prefix: kubernetes-jenkins/logs/ci-cos-cgroupv1-containerd-node-e2e
+  gcs_prefix: kubernetes-ci-logs/logs/ci-cos-cgroupv1-containerd-node-e2e
   test_name_config:
     name_elements:
     - target_config: Tests name
     - target_config: Context
     name_format: '%s [%s]'
 - name: ci-cos-cgroupv1-containerd-node-e2e-features
-  gcs_prefix: kubernetes-jenkins/logs/ci-cos-cgroupv1-containerd-node-e2e-features
+  gcs_prefix: kubernetes-ci-logs/logs/ci-cos-cgroupv1-containerd-node-e2e-features
   test_name_config:
     name_elements:
     - target_config: Tests name
     - target_config: Context
     name_format: '%s [%s]'
 - name: ci-cos-containerd-node-e2e
-  gcs_prefix: kubernetes-jenkins/logs/ci-cos-containerd-node-e2e
+  gcs_prefix: kubernetes-ci-logs/logs/ci-cos-containerd-node-e2e
   test_name_config:
     name_elements:
     - target_config: Tests name
     - target_config: Context
     name_format: '%s [%s]'
 - name: ci-cos-containerd-node-e2e-features
-  gcs_prefix: kubernetes-jenkins/logs/ci-cos-containerd-node-e2e-features
+  gcs_prefix: kubernetes-ci-logs/logs/ci-cos-containerd-node-e2e-features
   test_name_config:
     name_elements:
     - target_config: Tests name
     - target_config: Context
     name_format: '%s [%s]'
 - name: ci-kubernetes-coverage-conformance
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-coverage-conformance
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-coverage-conformance
   short_text_metric: coverage
 - name: ci-kubernetes-coverage-e2e-gci-gce
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-coverage-e2e-gci-gce
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-coverage-e2e-gci-gce
   short_text_metric: coverage
 - name: ci-kubernetes-e2e-gce-scale-correctness
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-scale-correctness
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-scale-correctness
   days_of_results: 60
   num_columns_recent: 3
 - name: ci-kubernetes-e2e-gce-scale-performance
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-scale-performance
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-scale-performance
   days_of_results: 60
   num_columns_recent: 3
   num_failures_to_alert: 1

diff --git a/config/testgrids/generated-test-config.yaml b/config/testgrids/generated-test-config.yaml
@@ -2,175 +2,175 @@
 
 test_groups:
 - name: ci-kubernetes-e2e-gce-cos-k8sbeta-alphafeatures
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-cos-k8sbeta-alphafeatures
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sbeta-alphafeatures
   column_header:
   - configuration_value: node_os_image
   - configuration_value: master_os_image
   - configuration_value: Commit
   - configuration_value: infra-commit
 - name: ci-kubernetes-e2e-gce-cos-k8sbeta-default
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-cos-k8sbeta-default
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sbeta-default
   column_header:
   - configuration_value: node_os_image
   - configuration_value: master_os_image
   - configuration_value: Commit
   - configuration_value: infra-commit
 - name: ci-kubernetes-e2e-gce-cos-k8sbeta-ingress
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-cos-k8sbeta-ingress
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sbeta-ingress
   column_header:
   - configuration_value: node_os_image
   - configuration_value: master_os_image
   - configuration_value: Commit
   - configuration_value: infra-commit
 - name: ci-kubernetes-e2e-gce-cos-k8sbeta-reboot
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-cos-k8sbeta-reboot
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sbeta-reboot
   column_header:
   - configuration_value: node_os_image
   - configuration_value: master_os_image
   - configuration_value: Commit
   - configuration_value: infra-commit
 - name: ci-kubernetes-e2e-gce-cos-k8sbeta-serial
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-cos-k8sbeta-serial
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sbeta-serial
   column_header:
   - configuration_value: node_os_image
   - configuration_value: master_os_image
   - configuration_value: Commit
   - configuration_value: infra-commit
 - name: ci-kubernetes-e2e-gce-cos-k8sbeta-slow
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-cos-k8sbeta-slow
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sbeta-slow
   column_header:
   - configuration_value: node_os_image
   - configuration_value: master_os_image
   - configuration_value: Commit
   - configuration_value: infra-commit
 - name: ci-kubernetes-e2e-gce-cos-k8sstable1-alphafeatures
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-cos-k8sstable1-alphafeatures
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sstable1-alphafeatures
   column_header:
   - configuration_value: node_os_image
   - configuration_value: master_os_image
   - configuration_value: Commit
   - configuration_value: infra-commit
 - name: ci-kubernetes-e2e-gce-cos-k8sstable1-default
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-cos-k8sstable1-default
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sstable1-default
   column_header:
   - configuration_value: node_os_image
   - configuration_value: master_os_image
   - configuration_value: Commit
   - configuration_value: infra-commit
 - name: ci-kubernetes-e2e-gce-cos-k8sstable1-ingress
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-cos-k8sstable1-ingress
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sstable1-ingress
   column_header:
   - configuration_value: node_os_image
   - configuration_value: master_os_image
   - configuration_value: Commit
   - configuration_value: infra-commit
 - name: ci-kubernetes-e2e-gce-cos-k8sstable1-reboot
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-cos-k8sstable1-reboot
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sstable1-reboot
   column_header:
   - configuration_value: node_os_image
   - configuration_value: master_os_image
   - configuration_value: Commit
   - configuration_value: infra-commit
 - name: ci-kubernetes-e2e-gce-cos-k8sstable1-serial
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-cos-k8sstable1-serial
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sstable1-serial
   column_header:
   - configuration_value: node_os_image
   - configuration_value: master_os_image
   - configuration_value: Commit
   - configuration_value: infra-commit
 - name: ci-kubernetes-e2e-gce-cos-k8sstable1-slow
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-cos-k8sstable1-slow
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sstable1-slow
   column_header:
   - configuration_value: node_os_image
   - configuration_value: master_os_image
   - configuration_value: Commit
   - configuration_value: infra-commit
 - name: ci-kubernetes-e2e-gce-cos-k8sstable2-alphafeatures
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-cos-k8sstable2-alphafeatures
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sstable2-alphafeatures
   column_header:
   - configuration_value: node_os_image
   - configuration_value: master_os_image
   - configuration_value: Commit
   - configuration_value: infra-commit
 - name: ci-kubernetes-e2e-gce-cos-k8sstable2-default
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-cos-k8sstable2-default
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sstable2-default
   column_header:
   - configuration_value: node_os_image
   - configuration_value: master_os_image
   - configuration_value: Commit
   - configuration_value: infra-commit
 - name: ci-kubernetes-e2e-gce-cos-k8sstable2-ingress
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-cos-k8sstable2-ingress
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sstable2-ingress
   column_header:
   - configuration_value: node_os_image
   - configuration_value: master_os_image
   - configuration_value: Commit
   - configuration_value: infra-commit
 - name: ci-kubernetes-e2e-gce-cos-k8sstable2-reboot
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-cos-k8sstable2-reboot
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sstable2-reboot
   column_header:
   - configuration_value: node_os_image
   - configuration_value: master_os_image
   - configuration_value: Commit
   - configuration_value: infra-commit
 - name: ci-kubernetes-e2e-gce-cos-k8sstable2-serial
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-cos-k8sstable2-serial
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sstable2-serial
   column_header:
   - configuration_value: node_os_image
   - configuration_value: master_os_image
   - configuration_value: Commit
   - configuration_value: infra-commit
 - name: ci-kubernetes-e2e-gce-cos-k8sstable2-slow
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-cos-k8sstable2-slow
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sstable2-slow
   column_header:
   - configuration_value: node_os_image
   - configuration_value: master_os_image
   - configuration_value: Commit
   - configuration_value: infra-commit
 - name: ci-kubernetes-e2e-gce-cos-k8sstable3-alphafeatures
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-cos-k8sstable3-alphafeatures
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sstable3-alphafeatures
   column_header:
   - configuration_value: node_os_image
   - configuration_value: master_os_image
   - configuration_value: Commit
   - configuration_value: infra-commit
 - name: ci-kubernetes-e2e-gce-cos-k8sstable3-betaapis
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-cos-k8sstable3-betaapis
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sstable3-betaapis
   column_header:
   - configuration_value: node_os_image
   - configuration_value: master_os_image
   - configuration_value: Commit
   - configuration_value: infra-commit
 - name: ci-kubernetes-e2e-gce-cos-k8sstable3-default
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-cos-k8sstable3-default
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sstable3-default
   column_header:
   - configuration_value: node_os_image
   - configuration_value: master_os_image
   - configuration_value: Commit
   - configuration_value: infra-commit
 - name: ci-kubernetes-e2e-gce-cos-k8sstable3-ingress
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-cos-k8sstable3-ingress
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sstable3-ingress
   column_header:
   - configuration_value: node_os_image
   - configuration_value: master_os_image
   - configuration_value: Commit
   - configuration_value: infra-commit
 - name: ci-kubernetes-e2e-gce-cos-k8sstable3-reboot
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-cos-k8sstable3-reboot
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sstable3-reboot
   column_header:
   - configuration_value: node_os_image
   - configuration_value: master_os_image
   - configuration_value: Commit
   - configuration_value: infra-commit
 - name: ci-kubernetes-e2e-gce-cos-k8sstable3-serial
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-cos-k8sstable3-serial
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sstable3-serial
   column_header:
   - configuration_value: node_os_image
   - configuration_value: master_os_image
   - configuration_value: Commit
   - configuration_value: infra-commit
 - name: ci-kubernetes-e2e-gce-cos-k8sstable3-slow
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-cos-k8sstable3-slow
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-e2e-gce-cos-k8sstable3-slow
   column_header:
   - configuration_value: node_os_image
   - configuration_value: master_os_image

diff --git a/config/testgrids/kubernetes/sig-cluster-lifecycle/config.yaml b/config/testgrids/kubernetes/sig-cluster-lifecycle/config.yaml
@@ -73,14 +73,14 @@ dashboards:
 
 test_groups:
 - name: periodic-cluster-api-provider-azure-coverage
-  gcs_prefix: kubernetes-jenkins/logs/periodic-cluster-api-provider-azure-coverage
+  gcs_prefix: kubernetes-ci-logs/logs/periodic-cluster-api-provider-azure-coverage
   short_text_metric: coverage
 - name: periodic-cluster-api-provider-aws-coverage
-  gcs_prefix: kubernetes-jenkins/logs/periodic-cluster-api-provider-aws-coverage
+  gcs_prefix: kubernetes-ci-logs/logs/periodic-cluster-api-provider-aws-coverage
   short_text_metric: coverage
 - name: periodic-cluster-api-provider-ibmcloud-coverage
-  gcs_prefix: kubernetes-jenkins/logs/periodic-cluster-api-provider-ibmcloud-coverage
+  gcs_prefix: kubernetes-ci-logs/logs/periodic-cluster-api-provider-ibmcloud-coverage
   short_text_metric: coverage
 - name: pull-cluster-api-provider-ibmcloud-coverage
-  gcs_prefix: kubernetes-jenkins/logs/pull-cluster-api-provider-ibmcloud-coverage
+  gcs_prefix: kubernetes-ci-logs/logs/pull-cluster-api-provider-ibmcloud-coverage
   short_text_metric: coverage
diff --git a/config/testgrids/kubernetes/sig-testing/sig-testing.yaml b/config/testgrids/kubernetes/sig-testing/sig-testing.yaml
@@ -2,7 +2,7 @@
 
 test_groups:
 - name: ci-kubernetes-coverage-unit
-  gcs_prefix: kubernetes-jenkins/logs/ci-kubernetes-coverage-unit
+  gcs_prefix: kubernetes-ci-logs/logs/ci-kubernetes-coverage-unit
   short_text_metric: coverage
 
 # Dashboard Group

diff --git a/config/tests/testgrids/config_test.go b/config/tests/testgrids/config_test.go
@@ -78,6 +78,8 @@ var (
 	prowGcsPrefixes = []string{
 		"kubernetes-jenkins/logs/",
 		"kubernetes-jenkins/pr-logs/directory/",
+		"kubernetes-ci-logs/logs/",
+		"kubernetes-ci-logs/pr-logs/directory/",
 	}
 )
 
@@ -178,7 +180,7 @@ func TestConfig(t *testing.T) {
 			for _, prowGcsPrefix := range prowGcsPrefixes {
 				if strings.Contains(testgroup.GcsPrefix, prowGcsPrefix) {
 					// The expectation is that testgroup.Name is the name of a Prow job and the GCSPrefix
-					// follows the convention kubernetes-jenkins/logs/.../jobName
+					// follows the convention kubernetes-ci-logs/logs/.../jobName
 					// The final part of the prefix should be the job name.
 					expected := filepath.Join(filepath.Dir(testgroup.GcsPrefix), testgroup.Name)
 					if expected != testgroup.GcsPrefix {
@@ -199,7 +201,7 @@ func TestConfig(t *testing.T) {
 			}
 
 			// All PR testgroup has num_columns_recent equals 20
-			if strings.HasPrefix(testgroup.GcsPrefix, "kubernetes-jenkins/pr-logs/directory/") {
+			if strings.HasPrefix(testgroup.GcsPrefix, "kubernetes-jenkins/pr-logs/directory/") || strings.HasPrefix(testgroup.GcsPrefix, "kubernetes-ci-logs/pr-logs/directory/") {
 				if testgroup.NumColumnsRecent < 20 {
 					t.Errorf("presubmit num_columns_recent want >=20, got %d", testgroup.NumColumnsRecent)
 				}

diff --git a/releng/generate_tests.py b/releng/generate_tests.py
@@ -70,7 +70,7 @@
     - configuration_value: infra-commit
 """
 
-GCS_LOG_PREFIX = "kubernetes-jenkins/logs/"
+GCS_LOG_PREFIX = "kubernetes-ci-logs/logs/"
 
 COMMENT = 'AUTO-GENERATED by releng/generate_tests.py - DO NOT EDIT.'