Skip to content

Commit 74efa0f

Browse files
authored
Merge pull request #35873 from SergeyKanzhelev/cri-ptoxy-all-alpha
added cri-proxy all-alpha variants of test jobs
2 parents 5f8eda4 + 452a192 commit 74efa0f

File tree

2 files changed

+110
-0
lines changed

2 files changed

+110
-0
lines changed

config/jobs/kubernetes/sig-node/node-kubelet.yaml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -931,6 +931,62 @@ periodics:
931931
- --node-tests=true
932932
- --provider=gce
933933
# all criproxy tests are serial, but no need to specify it
934+
# disabled features are handled by -all-alpha variant of this test job
935+
- --test_args=--nodes=1 --focus="\[Feature:CriProxy\]" --skip="\[Flaky\]|\[Featuure:OffByDefault\]"
936+
- --timeout=120m
937+
env:
938+
- name: GOPATH
939+
value: /go
940+
resources:
941+
requests:
942+
cpu: 4
943+
memory: 6Gi
944+
limits:
945+
cpu: 4
946+
memory: 6Gi
947+
948+
- name: ci-kubernetes-node-e2e-cri-proxy-all-alpha-serial
949+
interval: 24h
950+
cluster: k8s-infra-prow-build
951+
annotations:
952+
testgrid-dashboards: sig-node-kubelet
953+
testgrid-tab-name: node-kubelet-cri-proxy-all-alpha
954+
testgrid-alert-email: [email protected]
955+
description: "Use cri proxy"
956+
labels:
957+
preset-service-account: "true"
958+
preset-k8s-ssh: "true"
959+
decorate: true
960+
decoration_config:
961+
timeout: 150m
962+
extra_refs:
963+
- org: kubernetes
964+
repo: kubernetes
965+
base_ref: master
966+
path_alias: k8s.io/kubernetes
967+
workdir: true
968+
- org: containerd
969+
repo: containerd
970+
base_ref: main
971+
path_alias: github.com/containerd/containerd
972+
- org: kubernetes
973+
repo: test-infra
974+
base_ref: master
975+
path_alias: k8s.io/test-infra
976+
spec:
977+
containers:
978+
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20251021-e2c2c9806f-master
979+
command:
980+
- runner.sh
981+
- /workspace/scenarios/kubernetes_e2e.py
982+
args:
983+
- --node-args=--image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-main/systemd/image-config.yaml
984+
- --deployment=node
985+
- --gcp-zone=us-central1-b
986+
- '--node-test-args=--cri-proxy-enabled=true --feature-gates=AllAlpha=true,AllBeta=true --service-feature-gates=AllAlpha=true,AllBeta=true --runtime-config=api/alpha=true,api/beta=true --container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service"'
987+
- --node-tests=true
988+
- --provider=gce
989+
# all criproxy tests are serial, but no need to specify it
934990
- --test_args=--nodes=1 --focus="\[Feature:CriProxy\]" --skip="\[Flaky\]"
935991
- --timeout=120m
936992
env:

config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2913,6 +2913,60 @@ presubmits:
29132913
- --node-tests=true
29142914
- --provider=gce
29152915
# all criproxy tests are serial, but no need to specify it
2916+
# the -all-alpha variant covers features that are not enabled by default
2917+
- --test_args=--nodes=1 --focus="\[Feature:CriProxy\]" --skip="\[Flaky\]|\[Featuure:OffByDefault\]"
2918+
- --timeout=120m
2919+
env:
2920+
- name: GOPATH
2921+
value: /go
2922+
resources:
2923+
requests:
2924+
cpu: 4
2925+
memory: 6Gi
2926+
limits:
2927+
cpu: 4
2928+
memory: 6Gi
2929+
- name: pull-kubernetes-node-e2e-cri-proxy-all-alpha-serial
2930+
cluster: k8s-infra-prow-build
2931+
always_run: false
2932+
optional: true
2933+
max_concurrency: 12
2934+
skip_report: false
2935+
skip_branches:
2936+
- release-\d+\.\d+ # per-release image
2937+
labels:
2938+
preset-service-account: "true"
2939+
preset-k8s-ssh: "true"
2940+
annotations:
2941+
testgrid-dashboards: sig-node-presubmits
2942+
testgrid-tab-name: pr-node-kubelet-cri-all-alpha-proxy
2943+
decorate: true
2944+
decoration_config:
2945+
timeout: 150m
2946+
path_alias: k8s.io/kubernetes
2947+
extra_refs:
2948+
- org: containerd
2949+
repo: containerd
2950+
base_ref: main
2951+
path_alias: github.com/containerd/containerd
2952+
- org: kubernetes
2953+
repo: test-infra
2954+
base_ref: master
2955+
path_alias: k8s.io/test-infra
2956+
spec:
2957+
containers:
2958+
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20251021-e2c2c9806f-master
2959+
command:
2960+
- runner.sh
2961+
- /workspace/scenarios/kubernetes_e2e.py
2962+
args:
2963+
- --node-args=--image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-main/systemd/image-config.yaml
2964+
- --deployment=node
2965+
- --gcp-zone=us-central1-b
2966+
- '--node-test-args=--cri-proxy-enabled=true --feature-gates=AllAlpha=true,AllBeta=true --service-feature-gates=AllAlpha=true,AllBeta=true --runtime-config=api/alpha=true,api/beta=true --container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service"'
2967+
- --node-tests=true
2968+
- --provider=gce
2969+
# all criproxy tests are serial, but no need to specify it
29162970
- --test_args=--nodes=1 --focus="\[Feature:CriProxy\]" --skip="\[Flaky\]"
29172971
- --timeout=120m
29182972
env:

0 commit comments

Comments
 (0)