Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate TestGrid locations to gs://kubernetes-ci-logs. #33495

Merged
merged 1 commit into from
Sep 19, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions config/testgrids/config.yaml
Original file line number Diff line number Diff line change
@@ -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
50 changes: 25 additions & 25 deletions config/testgrids/generated-test-config.yaml
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions config/testgrids/kubernetes/sig-cluster-lifecycle/config.yaml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion config/testgrids/kubernetes/sig-testing/sig-testing.yaml
Original file line number Diff line number Diff line change
@@ -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
6 changes: 4 additions & 2 deletions config/tests/testgrids/config_test.go
Original file line number Diff line number Diff line change
@@ -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)
}
2 changes: 1 addition & 1 deletion releng/generate_tests.py
Original file line number Diff line number Diff line change
@@ -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.'