Skip to content

Commit 4390550

Browse files
committed
fix the arm64 conformance board
1 parent 9061540 commit 4390550

File tree

4 files changed

+12
-21
lines changed

4 files changed

+12
-21
lines changed

config/jobs/kubernetes/kops/build_jobs.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,7 +1377,7 @@ def generate_conformance():
13771377
"--master-size=t3.large"],
13781378
test_parallelism=1,
13791379
test_timeout_minutes=150,
1380-
extra_dashboards=['kops-conformance'],
1380+
extra_dashboards=['kops-conformance', 'conformance-all'],
13811381
runs_per_day=1,
13821382
focus_regex=r'\[Conformance\]',
13831383
skip_regex=r'\[NoSkip\]',
@@ -1397,7 +1397,7 @@ def generate_conformance():
13971397
"--master-size=t4g.large"],
13981398
test_parallelism=1,
13991399
test_timeout_minutes=150,
1400-
extra_dashboards=['kops-conformance'],
1400+
extra_dashboards=['kops-conformance', 'conformance-all', 'conformance-arm64'],
14011401
runs_per_day=1,
14021402
focus_regex=r'\[Conformance\]',
14031403
skip_regex=r'\[NoSkip\]',

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ periodics:
6464
test.kops.k8s.io/kops_channel: alpha
6565
test.kops.k8s.io/kops_version: '1.33'
6666
test.kops.k8s.io/networking: calico
67-
testgrid-dashboards: kops-1.33, kops-conformance, kops-distro-u2404, kops-k8s-1.33, sig-cluster-lifecycle-kops
67+
testgrid-dashboards: conformance-all, kops-1.33, kops-conformance, kops-distro-u2404, kops-k8s-1.33, sig-cluster-lifecycle-kops
6868
testgrid-days-of-results: '90'
6969
testgrid-tab-name: kops-aws-conformance-1-33
7070

@@ -130,7 +130,7 @@ periodics:
130130
test.kops.k8s.io/kops_channel: alpha
131131
test.kops.k8s.io/kops_version: '1.33'
132132
test.kops.k8s.io/networking: calico
133-
testgrid-dashboards: kops-1.33, kops-conformance, kops-distro-u2404, kops-k8s-1.33, sig-cluster-lifecycle-kops
133+
testgrid-dashboards: conformance-all, conformance-arm64, kops-1.33, kops-conformance, kops-distro-u2404, kops-k8s-1.33, sig-cluster-lifecycle-kops
134134
testgrid-days-of-results: '90'
135135
testgrid-tab-name: kops-aws-conformance-arm64-1-33
136136

@@ -196,7 +196,7 @@ periodics:
196196
test.kops.k8s.io/kops_channel: alpha
197197
test.kops.k8s.io/kops_version: '1.32'
198198
test.kops.k8s.io/networking: calico
199-
testgrid-dashboards: kops-1.32, kops-conformance, kops-distro-u2404, kops-k8s-1.32, sig-cluster-lifecycle-kops
199+
testgrid-dashboards: conformance-all, kops-1.32, kops-conformance, kops-distro-u2404, kops-k8s-1.32, sig-cluster-lifecycle-kops
200200
testgrid-days-of-results: '90'
201201
testgrid-tab-name: kops-aws-conformance-1-32
202202

@@ -262,7 +262,7 @@ periodics:
262262
test.kops.k8s.io/kops_channel: alpha
263263
test.kops.k8s.io/kops_version: '1.32'
264264
test.kops.k8s.io/networking: calico
265-
testgrid-dashboards: kops-1.32, kops-conformance, kops-distro-u2404, kops-k8s-1.32, sig-cluster-lifecycle-kops
265+
testgrid-dashboards: conformance-all, conformance-arm64, kops-1.32, kops-conformance, kops-distro-u2404, kops-k8s-1.32, sig-cluster-lifecycle-kops
266266
testgrid-days-of-results: '90'
267267
testgrid-tab-name: kops-aws-conformance-arm64-1-32
268268

@@ -328,7 +328,7 @@ periodics:
328328
test.kops.k8s.io/kops_channel: alpha
329329
test.kops.k8s.io/kops_version: '1.31'
330330
test.kops.k8s.io/networking: calico
331-
testgrid-dashboards: kops-1.31, kops-conformance, kops-distro-u2404, kops-k8s-1.31, sig-cluster-lifecycle-kops
331+
testgrid-dashboards: conformance-all, kops-1.31, kops-conformance, kops-distro-u2404, kops-k8s-1.31, sig-cluster-lifecycle-kops
332332
testgrid-days-of-results: '90'
333333
testgrid-tab-name: kops-aws-conformance-1-31
334334

@@ -394,7 +394,7 @@ periodics:
394394
test.kops.k8s.io/kops_channel: alpha
395395
test.kops.k8s.io/kops_version: '1.31'
396396
test.kops.k8s.io/networking: calico
397-
testgrid-dashboards: kops-1.31, kops-conformance, kops-distro-u2404, kops-k8s-1.31, sig-cluster-lifecycle-kops
397+
testgrid-dashboards: conformance-all, conformance-arm64, kops-1.31, kops-conformance, kops-distro-u2404, kops-k8s-1.31, sig-cluster-lifecycle-kops
398398
testgrid-days-of-results: '90'
399399
testgrid-tab-name: kops-aws-conformance-arm64-1-31
400400

@@ -460,7 +460,7 @@ periodics:
460460
test.kops.k8s.io/kops_channel: alpha
461461
test.kops.k8s.io/kops_version: '1.30'
462462
test.kops.k8s.io/networking: calico
463-
testgrid-dashboards: kops-1.30, kops-conformance, kops-distro-u2404, kops-k8s-1.30, sig-cluster-lifecycle-kops
463+
testgrid-dashboards: conformance-all, kops-1.30, kops-conformance, kops-distro-u2404, kops-k8s-1.30, sig-cluster-lifecycle-kops
464464
testgrid-days-of-results: '90'
465465
testgrid-tab-name: kops-aws-conformance-1-30
466466

@@ -526,6 +526,6 @@ periodics:
526526
test.kops.k8s.io/kops_channel: alpha
527527
test.kops.k8s.io/kops_version: '1.30'
528528
test.kops.k8s.io/networking: calico
529-
testgrid-dashboards: kops-1.30, kops-conformance, kops-distro-u2404, kops-k8s-1.30, sig-cluster-lifecycle-kops
529+
testgrid-dashboards: conformance-all, conformance-arm64, kops-1.30, kops-conformance, kops-distro-u2404, kops-k8s-1.30, sig-cluster-lifecycle-kops
530530
testgrid-days-of-results: '90'
531531
testgrid-tab-name: kops-aws-conformance-arm64-1-30

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,7 @@ periodics:
727727
cluster: eks-prow-build-cluster
728728
name: ci-kubernetes-ec2-arm64-conformance-latest
729729
annotations:
730-
testgrid-dashboards: amazon-ec2, conformance-all, conformance-ec2, sig-release-master-informing, amazon-ec2-release
730+
testgrid-dashboards: amazon-ec2, conformance-all, conformance-ec2, conformance-arm64, sig-release-master-informing, amazon-ec2-release
731731
testgrid-alert-email: [email protected]
732732
testgrid-tab-name: Conformance - EC2 - arm64 - master
733733
description: Runs conformance tests using kubetest against kubernetes master on EC2 (arm64)

config/testgrids/conformance/conformance-all.yaml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ dashboards:
127127

128128
- name: conformance-hack-local-up-cluster
129129
- name: conformance-ppc64le
130+
- name: conformance-arm64
130131

131132
# Gardener Conformance Dashboard
132133
- name: conformance-gardener
@@ -310,17 +311,7 @@ dashboards:
310311
code_search_url_template: # The URL template to visit when searching for changelists
311312
url: https://github.com/google/cel-go/compare/<start-custom-0>...<end-custom-0>
312313

313-
# arm64 dashboard
314-
- name: conformance-arm64
315-
dashboard_tab:
316-
- name: Periodic arm64 conformance test
317-
test_group_name: arm64-conformance-containerd
318-
description: Runs conformance tests against latest version of kubernetes with containerd as runtime on local arm64 cluster
319-
320314
test_groups:
321-
# arm64 conformance Test Groups
322-
- name: arm64-conformance-containerd
323-
gcs_prefix: arm64-k8s-test/logs/conformance-arm64
324315

325316
# cloud-provider-huaweicloud e2e conformance Test Groups
326317
- name: cloud-provider-huaweicloud-e2e-conformance-release-v1.17

0 commit comments

Comments
 (0)