Merge pull request #35341 from upodroid/fix-arm64-board

fix the arm64 conformance board

Author: k8s-ci-robot

config/jobs/kubernetes/kops/build_jobs.py

@@ -1377,7 +1377,7 @@ def generate_conformance():
                              "--master-size=t3.large"],
                 test_parallelism=1,
                 test_timeout_minutes=150,
-                extra_dashboards=['kops-conformance'],
+                extra_dashboards=['kops-conformance', 'conformance-all'],
                 runs_per_day=1,
                 focus_regex=r'\[Conformance\]',
                 skip_regex=r'\[NoSkip\]',
@@ -1397,7 +1397,7 @@ def generate_conformance():
                              "--master-size=t4g.large"],
                 test_parallelism=1,
                 test_timeout_minutes=150,
-                extra_dashboards=['kops-conformance'],
+                extra_dashboards=['kops-conformance', 'conformance-all', 'conformance-arm64'],
                 runs_per_day=1,
                 focus_regex=r'\[Conformance\]',
                 skip_regex=r'\[NoSkip\]',

config/jobs/kubernetes/kops/kops-periodics-conformance.yaml

@@ -64,7 +64,7 @@ periodics:
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.33'
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: kops-1.33, kops-conformance, kops-distro-u2404, kops-k8s-1.33, sig-cluster-lifecycle-kops
+    testgrid-dashboards: conformance-all, kops-1.33, kops-conformance, kops-distro-u2404, kops-k8s-1.33, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
     testgrid-tab-name: kops-aws-conformance-1-33
 
@@ -130,7 +130,7 @@ periodics:
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.33'
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: kops-1.33, kops-conformance, kops-distro-u2404, kops-k8s-1.33, sig-cluster-lifecycle-kops
+    testgrid-dashboards: conformance-all, conformance-arm64, kops-1.33, kops-conformance, kops-distro-u2404, kops-k8s-1.33, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
     testgrid-tab-name: kops-aws-conformance-arm64-1-33
 
@@ -196,7 +196,7 @@ periodics:
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.32'
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: kops-1.32, kops-conformance, kops-distro-u2404, kops-k8s-1.32, sig-cluster-lifecycle-kops
+    testgrid-dashboards: conformance-all, kops-1.32, kops-conformance, kops-distro-u2404, kops-k8s-1.32, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
     testgrid-tab-name: kops-aws-conformance-1-32
 
@@ -262,7 +262,7 @@ periodics:
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.32'
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: kops-1.32, kops-conformance, kops-distro-u2404, kops-k8s-1.32, sig-cluster-lifecycle-kops
+    testgrid-dashboards: conformance-all, conformance-arm64, kops-1.32, kops-conformance, kops-distro-u2404, kops-k8s-1.32, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
     testgrid-tab-name: kops-aws-conformance-arm64-1-32
 
@@ -328,7 +328,7 @@ periodics:
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.31'
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: kops-1.31, kops-conformance, kops-distro-u2404, kops-k8s-1.31, sig-cluster-lifecycle-kops
+    testgrid-dashboards: conformance-all, kops-1.31, kops-conformance, kops-distro-u2404, kops-k8s-1.31, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
     testgrid-tab-name: kops-aws-conformance-1-31
 
@@ -394,7 +394,7 @@ periodics:
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.31'
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: kops-1.31, kops-conformance, kops-distro-u2404, kops-k8s-1.31, sig-cluster-lifecycle-kops
+    testgrid-dashboards: conformance-all, conformance-arm64, kops-1.31, kops-conformance, kops-distro-u2404, kops-k8s-1.31, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
     testgrid-tab-name: kops-aws-conformance-arm64-1-31
 
@@ -460,7 +460,7 @@ periodics:
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.30'
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: kops-1.30, kops-conformance, kops-distro-u2404, kops-k8s-1.30, sig-cluster-lifecycle-kops
+    testgrid-dashboards: conformance-all, kops-1.30, kops-conformance, kops-distro-u2404, kops-k8s-1.30, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
     testgrid-tab-name: kops-aws-conformance-1-30
 
@@ -526,6 +526,6 @@ periodics:
     test.kops.k8s.io/kops_channel: alpha
     test.kops.k8s.io/kops_version: '1.30'
     test.kops.k8s.io/networking: calico
-    testgrid-dashboards: kops-1.30, kops-conformance, kops-distro-u2404, kops-k8s-1.30, sig-cluster-lifecycle-kops
+    testgrid-dashboards: conformance-all, conformance-arm64, kops-1.30, kops-conformance, kops-distro-u2404, kops-k8s-1.30, sig-cluster-lifecycle-kops
     testgrid-days-of-results: '90'
     testgrid-tab-name: kops-aws-conformance-arm64-1-30

config/jobs/kubernetes/sig-cloud-provider/aws/ec2-e2e.yaml

@@ -727,7 +727,7 @@ periodics:
   cluster: eks-prow-build-cluster
   name: ci-kubernetes-ec2-arm64-conformance-latest
   annotations:
-    testgrid-dashboards: amazon-ec2, conformance-all, conformance-ec2, sig-release-master-informing, amazon-ec2-release
+    testgrid-dashboards: amazon-ec2, conformance-all, conformance-ec2, conformance-arm64, sig-release-master-informing, amazon-ec2-release
     testgrid-alert-email: [email protected]
     testgrid-tab-name: Conformance - EC2 - arm64 - master
     description: Runs conformance tests using kubetest against kubernetes master on EC2 (arm64)

config/testgrids/conformance/conformance-all.yaml

@@ -127,6 +127,7 @@ dashboards:
 
 - name: conformance-hack-local-up-cluster
 - name: conformance-ppc64le
+- name: conformance-arm64
 
 # Gardener Conformance Dashboard
 - name: conformance-gardener
@@ -310,17 +311,7 @@ dashboards:
     code_search_url_template: # The URL template to visit when searching for changelists
       url: https://github.com/google/cel-go/compare/<start-custom-0>...<end-custom-0>
 
-# arm64 dashboard
-- name: conformance-arm64
-  dashboard_tab:
-    - name: Periodic arm64 conformance test
-      test_group_name: arm64-conformance-containerd
-      description: Runs conformance tests against latest version of kubernetes with containerd as runtime on local arm64 cluster
-
 test_groups:
-# arm64 conformance Test Groups
-- name: arm64-conformance-containerd
-  gcs_prefix: arm64-k8s-test/logs/conformance-arm64
 
 # cloud-provider-huaweicloud e2e conformance Test Groups
 - name: cloud-provider-huaweicloud-e2e-conformance-release-v1.17