Skip to content

Commit 643de0c

Browse files
authored
Merge pull request #35852 from upodroid/kops-jobs-patch
add kops debian presubmits and drop unsupported k8s versions jobs
2 parents 1e33308 + 1bed93e commit 643de0c

File tree

4 files changed

+164
-199
lines changed

4 files changed

+164
-199
lines changed

config/jobs/kubernetes/kops/build_jobs.py

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1830,7 +1830,7 @@ def generate_versions():
18301830
runs_per_day=8,
18311831
)
18321832
]
1833-
for version in ['1.35', '1.34', '1.33', '1.32', '1.31', '1.30', '1.29']:
1833+
for version in ['1.34', '1.33', '1.32', '1.31']:
18341834
results.append(
18351835
build_test(
18361836
cloud='aws',
@@ -2050,6 +2050,31 @@ def generate_presubmits_e2e():
20502050
tab_name='e2e-aws-amazonvpc-u2404',
20512051
optional=True,
20522052
),
2053+
presubmit_test(
2054+
cloud='gce',
2055+
k8s_version='stable',
2056+
distro='deb12arm64',
2057+
kops_channel='alpha',
2058+
name='pull-kops-e2e-k8s-gce-distro-debian12-arm64',
2059+
networking='kindnet',
2060+
always_run=False,
2061+
extra_flags=[
2062+
"--gce-service-account=default",
2063+
"--node-size=t2a-standard-2",
2064+
"--master-size=t2a-standard-2",
2065+
"--zones=us-central1-a"
2066+
],
2067+
),
2068+
presubmit_test(
2069+
cloud='gce',
2070+
k8s_version='stable',
2071+
distro='deb13',
2072+
kops_channel='alpha',
2073+
name='pull-kops-e2e-k8s-gce-distro-debian13',
2074+
networking='kindnet',
2075+
always_run=False,
2076+
extra_flags=["--gce-service-account=default"], # Workaround for test-infra#24747
2077+
),
20532078
presubmit_test(
20542079
cloud='gce',
20552080
k8s_version='stable',
@@ -2072,6 +2097,7 @@ def generate_presubmits_e2e():
20722097
"--zones=us-east1-b",
20732098
"--node-size=c4-standard-4",
20742099
"--master-size=c4-standard-2",
2100+
"--set cloudProvider.gce.pdCSIDriver.defaultStorageClassName=balanced-storage",
20752101
"--set spec.etcdClusters[*].etcdMembers[*].volumeIOPS=10000",
20762102
"--set spec.etcdClusters[*].etcdMembers[*].volumeThroughput=1000",
20772103
"--set spec.etcdClusters[*].etcdMembers[*].volumeSize=60",

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

Lines changed: 1 addition & 190 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Test jobs generated by build_jobs.py (do not manually edit)
2-
# 8 jobs, total of 448 runs per week
2+
# 5 jobs, total of 280 runs per week
33
periodics:
44

55
# {"cloud": "aws", "distro": "u2404", "k8s_version": "ci", "kops_channel": "alpha", "kops_version": "latest", "networking": "calico"}
@@ -67,69 +67,6 @@ periodics:
6767
testgrid-days-of-results: '35'
6868
testgrid-tab-name: kops-aws-k8s-latest
6969

70-
# {"cloud": "aws", "distro": "u2404", "k8s_version": "1.35", "kops_channel": "alpha", "kops_version": "latest", "networking": "calico"}
71-
- name: e2e-kops-aws-k8s-1-35
72-
cron: '41 1-23/3 * * *'
73-
labels:
74-
preset-service-account: "true"
75-
preset-aws-ssh: "true"
76-
preset-k8s-kops-aws-credential: "true"
77-
cluster: k8s-infra-kops-prow-build
78-
decorate: true
79-
decoration_config:
80-
timeout: 90m
81-
extra_refs:
82-
- org: kubernetes
83-
repo: kops
84-
base_ref: master
85-
workdir: true
86-
path_alias: k8s.io/kops
87-
spec:
88-
containers:
89-
- command:
90-
- runner.sh
91-
args:
92-
- bash
93-
- -c
94-
- |
95-
make test-e2e-install
96-
kubetest2 kops \
97-
-v 2 \
98-
--up --down \
99-
--cloud-provider=aws \
100-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20251022' --channel=alpha --networking=calico" \
101-
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
102-
--kubernetes-version=https://dl.k8s.io/release/stable-1.35.txt \
103-
--test=kops \
104-
-- \
105-
--test-args="-test.timeout=60m" \
106-
--test-package-marker=stable-1.35.txt \
107-
--parallel=25
108-
env:
109-
- name: KUBE_SSH_KEY_PATH
110-
value: /etc/aws-ssh/aws-ssh-private
111-
- name: KUBE_SSH_USER
112-
value: ubuntu
113-
image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20251021-e2c2c9806f-master
114-
imagePullPolicy: Always
115-
resources:
116-
limits:
117-
cpu: "4"
118-
memory: 6Gi
119-
requests:
120-
cpu: "4"
121-
memory: 6Gi
122-
annotations:
123-
test.kops.k8s.io/cloud: aws
124-
test.kops.k8s.io/distro: u2404
125-
test.kops.k8s.io/k8s_version: '1.35'
126-
test.kops.k8s.io/kops_channel: alpha
127-
test.kops.k8s.io/kops_version: latest
128-
test.kops.k8s.io/networking: calico
129-
testgrid-dashboards: kops-distro-u2404, kops-k8s-1.35, kops-latest, kops-versions, sig-cluster-lifecycle-kops
130-
testgrid-days-of-results: '35'
131-
testgrid-tab-name: kops-aws-k8s-1-35
132-
13370
# {"cloud": "aws", "distro": "u2404", "k8s_version": "1.34", "kops_channel": "alpha", "kops_version": "latest", "networking": "calico"}
13471
- name: e2e-kops-aws-k8s-1-34
13572
cron: '27 2-23/3 * * *'
@@ -381,129 +318,3 @@ periodics:
381318
testgrid-dashboards: kops-distro-u2404, kops-k8s-1.31, kops-latest, kops-versions, sig-cluster-lifecycle-kops
382319
testgrid-days-of-results: '35'
383320
testgrid-tab-name: kops-aws-k8s-1-31
384-
385-
# {"cloud": "aws", "distro": "u2404", "k8s_version": "1.30", "kops_channel": "alpha", "kops_version": "latest", "networking": "calico"}
386-
- name: e2e-kops-aws-k8s-1-30
387-
cron: '34 0-23/3 * * *'
388-
labels:
389-
preset-service-account: "true"
390-
preset-aws-ssh: "true"
391-
preset-k8s-kops-aws-credential: "true"
392-
cluster: k8s-infra-kops-prow-build
393-
decorate: true
394-
decoration_config:
395-
timeout: 90m
396-
extra_refs:
397-
- org: kubernetes
398-
repo: kops
399-
base_ref: master
400-
workdir: true
401-
path_alias: k8s.io/kops
402-
spec:
403-
containers:
404-
- command:
405-
- runner.sh
406-
args:
407-
- bash
408-
- -c
409-
- |
410-
make test-e2e-install
411-
kubetest2 kops \
412-
-v 2 \
413-
--up --down \
414-
--cloud-provider=aws \
415-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20251022' --channel=alpha --networking=calico" \
416-
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
417-
--kubernetes-version=https://dl.k8s.io/release/stable-1.30.txt \
418-
--test=kops \
419-
-- \
420-
--test-args="-test.timeout=60m" \
421-
--test-package-marker=stable-1.30.txt \
422-
--parallel=25
423-
env:
424-
- name: KUBE_SSH_KEY_PATH
425-
value: /etc/aws-ssh/aws-ssh-private
426-
- name: KUBE_SSH_USER
427-
value: ubuntu
428-
image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20251021-e2c2c9806f-master
429-
imagePullPolicy: Always
430-
resources:
431-
limits:
432-
cpu: "4"
433-
memory: 6Gi
434-
requests:
435-
cpu: "4"
436-
memory: 6Gi
437-
annotations:
438-
test.kops.k8s.io/cloud: aws
439-
test.kops.k8s.io/distro: u2404
440-
test.kops.k8s.io/k8s_version: '1.30'
441-
test.kops.k8s.io/kops_channel: alpha
442-
test.kops.k8s.io/kops_version: latest
443-
test.kops.k8s.io/networking: calico
444-
testgrid-dashboards: kops-distro-u2404, kops-k8s-1.30, kops-latest, kops-versions, sig-cluster-lifecycle-kops
445-
testgrid-days-of-results: '35'
446-
testgrid-tab-name: kops-aws-k8s-1-30
447-
448-
# {"cloud": "aws", "distro": "u2404", "k8s_version": "1.29", "kops_channel": "alpha", "kops_version": "latest", "networking": "calico"}
449-
- name: e2e-kops-aws-k8s-1-29
450-
cron: '11 1-23/3 * * *'
451-
labels:
452-
preset-service-account: "true"
453-
preset-aws-ssh: "true"
454-
preset-k8s-kops-aws-credential: "true"
455-
cluster: k8s-infra-kops-prow-build
456-
decorate: true
457-
decoration_config:
458-
timeout: 90m
459-
extra_refs:
460-
- org: kubernetes
461-
repo: kops
462-
base_ref: master
463-
workdir: true
464-
path_alias: k8s.io/kops
465-
spec:
466-
containers:
467-
- command:
468-
- runner.sh
469-
args:
470-
- bash
471-
- -c
472-
- |
473-
make test-e2e-install
474-
kubetest2 kops \
475-
-v 2 \
476-
--up --down \
477-
--cloud-provider=aws \
478-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20251022' --channel=alpha --networking=calico" \
479-
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
480-
--kubernetes-version=https://dl.k8s.io/release/stable-1.29.txt \
481-
--test=kops \
482-
-- \
483-
--test-args="-test.timeout=60m" \
484-
--test-package-marker=stable-1.29.txt \
485-
--parallel=25
486-
env:
487-
- name: KUBE_SSH_KEY_PATH
488-
value: /etc/aws-ssh/aws-ssh-private
489-
- name: KUBE_SSH_USER
490-
value: ubuntu
491-
image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20251021-e2c2c9806f-master
492-
imagePullPolicy: Always
493-
resources:
494-
limits:
495-
cpu: "4"
496-
memory: 6Gi
497-
requests:
498-
cpu: "4"
499-
memory: 6Gi
500-
annotations:
501-
test.kops.k8s.io/cloud: aws
502-
test.kops.k8s.io/distro: u2404
503-
test.kops.k8s.io/k8s_version: '1.29'
504-
test.kops.k8s.io/kops_channel: alpha
505-
test.kops.k8s.io/kops_version: latest
506-
test.kops.k8s.io/networking: calico
507-
testgrid-dashboards: kops-distro-u2404, kops-k8s-1.29, kops-latest, kops-versions, sig-cluster-lifecycle-kops
508-
testgrid-days-of-results: '35'
509-
testgrid-tab-name: kops-aws-k8s-1-29

0 commit comments

Comments
 (0)