From 3a8d39ecfec28201a742c87a9e6bcd0c2f1880a0 Mon Sep 17 00:00:00 2001 From: Rayan Das Date: Mon, 18 Oct 2021 23:11:53 +0530 Subject: [PATCH] migrate prowjobs to the community-owned build cluster and remove k8s-jkns-pr-node-e2e project from jobs. Signed-off-by: Rayan Das --- .../kubernetes/sig-node/node-kubelet.yaml | 1 + .../sig-node/sig-node-presubmit.yaml | 108 ++++++++++++++---- 2 files changed, 87 insertions(+), 22 deletions(-) diff --git a/config/jobs/kubernetes/sig-node/node-kubelet.yaml b/config/jobs/kubernetes/sig-node/node-kubelet.yaml index 8571d970769bc..bdccb5a2e20bb 100644 --- a/config/jobs/kubernetes/sig-node/node-kubelet.yaml +++ b/config/jobs/kubernetes/sig-node/node-kubelet.yaml @@ -211,6 +211,7 @@ periodics: testgrid-tab-name: node-kubelet-serial - name: ci-kubernetes-node-kubelet-serial-containerd + cluster: k8s-infra-prow-build interval: 4h labels: preset-service-account: "true" diff --git a/config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml b/config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml index 20c44c7fec091..148286a77db11 100644 --- a/config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml +++ b/config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml @@ -367,6 +367,7 @@ presubmits: - --image-config-file=/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-master/image-config.yaml - --image-config-dir=/home/prow - name: pull-kubernetes-node-e2e-alpha + cluster: k8s-infra-prow-build branches: - master always_run: false @@ -387,7 +388,6 @@ presubmits: - --scenario=kubernetes_e2e - -- # end bootstrap args, scenario args below - --deployment=node - - --gcp-project=k8s-jkns-pr-node-e2e - --gcp-zone=us-west1-b - --node-test-args=--feature-gates=AllAlpha=true,CSIMigration=false,RotateKubeletServerCertificate=false,InTreePluginGCEUnregister=false --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" - --node-tests=true @@ -396,11 +396,16 @@ presubmits: - --timeout=65m - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/image-config.yaml resources: + limits: + cpu: 4 + memory: 6Gi requests: - memory: "6Gi" + cpu: 4 + memory: 6Gi annotations: testgrid-create-test-group: 'true' - name: pull-kubernetes-node-e2e-alpha-kubetest2 + cluster: k8s-infra-prow-build # explicitly needs /test pull-kubernetes-node-e2e-alpha-kubetest2 to run always_run: false # if at all it is run and fails, don't block the PR @@ -427,8 +432,12 @@ presubmits: # https://github.com/kubernetes/test-infra/blob/3c3d64f398a5e4f324200d25183c98a4bfa842ac/images/kubekins-e2e/variants.yaml#L8 - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211108-d0d3c6d7a8-experimental resources: + limits: + cpu: 4 + memory: 6Gi requests: - memory: "6Gi" + cpu: 4 + memory: 6Gi command: - runner.sh args: @@ -437,7 +446,6 @@ presubmits: - --test=node - -- - --repo-root=. - - --gcp-project=k8s-jkns-pr-node-e2e - --gcp-zone=us-west1-b - --parallelism=8 - --focus-regex=\[NodeConformance\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\] @@ -784,6 +792,7 @@ presubmits: - --test-args=--feature-gates=LocalStorageCapacityIsolation=true --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" - --image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/image-config-serial.yaml - name: pull-kubernetes-node-kubelet-serial-cpu-manager + cluster: k8s-infra-prow-build always_run: false optional: true skip_report: false @@ -798,6 +807,13 @@ presubmits: spec: containers: - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211108-d0d3c6d7a8-master + resources: + limits: + cpu: 4 + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi args: - --repo=k8s.io/kubernetes=$(PULL_REFS) - --repo=k8s.io/release @@ -806,7 +822,6 @@ presubmits: - --scenario=kubernetes_e2e - -- - --deployment=node - - --gcp-project=k8s-jkns-pr-node-e2e - --gcp-zone=us-west1-b - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/image-config-serial-cpu-manager.yaml - --node-test-args=--kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" @@ -866,6 +881,7 @@ presubmits: - --test-args=--kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" - --image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/image-config-serial-cpu-manager.yaml - name: pull-kubernetes-node-kubelet-serial-topology-manager + cluster: k8s-infra-prow-build always_run: false optional: true skip_report: false @@ -880,6 +896,13 @@ presubmits: spec: containers: - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211108-d0d3c6d7a8-master + resources: + limits: + cpu: 4 + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi args: - --repo=k8s.io/kubernetes=$(PULL_REFS) - --repo=k8s.io/release @@ -888,7 +911,6 @@ presubmits: - --scenario=kubernetes_e2e - -- - --deployment=node - - --gcp-project=k8s-jkns-pr-node-e2e - --gcp-zone=us-west1-b - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/image-config-serial-cpu-manager.yaml - --node-test-args=--kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" @@ -948,6 +970,7 @@ presubmits: - --test-args=--kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" - --image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/image-config-serial-cpu-manager.yaml - name: pull-kubernetes-node-kubelet-serial-hugepages + cluster: k8s-infra-prow-build always_run: false optional: true skip_report: false @@ -962,6 +985,13 @@ presubmits: spec: containers: - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211108-d0d3c6d7a8-master + resources: + limits: + cpu: 4 + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi args: - --repo=k8s.io/kubernetes=$(PULL_REFS) - --repo=k8s.io/release @@ -970,7 +1000,6 @@ presubmits: - --scenario=kubernetes_e2e - -- - --deployment=node - - --gcp-project=k8s-jkns-pr-node-e2e - --gcp-zone=us-west1-b - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/image-config-serial-hugepages.yaml - --node-test-args=--kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" @@ -982,6 +1011,7 @@ presubmits: - name: GOPATH value: /go - name: pull-kubernetes-node-crio-cgrpv2-e2e + cluster: k8s-infra-prow-build skip_branches: - release-\d+\.\d+ # per-release image annotations: @@ -1009,7 +1039,6 @@ presubmits: - -- # end bootstrap args, scenario args below - --deployment=node - --env=KUBE_SSH_USER=core - - --gcp-project=k8s-jkns-pr-node-e2e - --gcp-zone=us-west1-b - '--node-test-args=--container-runtime=remote --container-runtime-endpoint=unix:///var/run/crio/crio.sock --container-runtime-process-name=/usr/local/bin/crio --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/crio.service --kubelet-cgroups=/system.slice/kubelet.service --non-masquerade-cidr=0.0.0.0/0" --extra-log="{\"name\": \"crio.log\", \"journalctl\": [\"-u\", \"crio\"]}"' - --node-tests=true @@ -1018,8 +1047,12 @@ presubmits: - --timeout=180m - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/crio/latest/image-config-cgrpv2.yaml resources: + limits: + cpu: 4 + memory: 6Gi requests: - memory: "6Gi" + cpu: 4 + memory: 6Gi - name: pull-kubernetes-node-crio-cgrpv2-e2e-kubetest2 # explicitly needs /test pull-kubernetes-node-crio-cgrpv2-e2e-kubetest2 to run always_run: false @@ -1071,6 +1104,7 @@ presubmits: - '--test-args=--container-runtime=remote --container-runtime-endpoint=unix:///var/run/crio/crio.sock --container-runtime-process-name=/usr/local/bin/crio --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/crio.service --kubelet-cgroups=/system.slice/kubelet.service --non-masquerade-cidr=0.0.0.0/0" --extra-log="{\"name\": \"crio.log\", \"journalctl\": [\"-u\", \"crio\"]}"' - --image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/latest/image-config-cgrpv2.yaml - name: pull-kubernetes-node-kubelet-serial-crio-cgroupv1 + cluster: k8s-infra-prow-build skip_branches: - release-\d+\.\d+ # per-release image annotations: @@ -1097,7 +1131,6 @@ presubmits: - -- # end bootstrap args, scenario args below - --deployment=node - --env=KUBE_SSH_USER=core - - --gcp-project=k8s-jkns-pr-node-e2e - --gcp-zone=us-west1-b - '--node-test-args=--feature-gates=DynamicKubeletConfig=true,LocalStorageCapacityIsolation=true --container-runtime=remote --container-runtime-endpoint=unix:///var/run/crio/crio.sock --container-runtime-process-name=/usr/local/bin/crio --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/crio.service --kubelet-cgroups=/system.slice/kubelet.service --non-masquerade-cidr=0.0.0.0/0" --extra-log="{\"name\": \"crio.log\", \"journalctl\": [\"-u\", \"crio\"]}"' - --node-tests=true @@ -1106,9 +1139,14 @@ presubmits: - --timeout=420m - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/crio/latest/image-config-cgrpv1-serial.yaml resources: + limits: + cpu: 4 + memory: 6Gi requests: - memory: "6Gi" + cpu: 4 + memory: 6Gi - name: pull-kubernetes-node-kubelet-serial-crio-cgroupv2 + cluster: k8s-infra-prow-build skip_branches: - release-\d+\.\d+ # per-release image annotations: @@ -1135,7 +1173,6 @@ presubmits: - -- # end bootstrap args, scenario args below - --deployment=node - --env=KUBE_SSH_USER=core - - --gcp-project=k8s-jkns-pr-node-e2e - --gcp-zone=us-west1-b - '--node-test-args=--feature-gates=DynamicKubeletConfig=true,LocalStorageCapacityIsolation=true --container-runtime=remote --container-runtime-endpoint=unix:///var/run/crio/crio.sock --container-runtime-process-name=/usr/local/bin/crio --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/crio.service --kubelet-cgroups=/system.slice/kubelet.service --non-masquerade-cidr=0.0.0.0/0" --extra-log="{\"name\": \"crio.log\", \"journalctl\": [\"-u\", \"crio\"]}"' - --node-tests=true @@ -1144,9 +1181,14 @@ presubmits: - --timeout=420m - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/crio/latest/image-config-cgrpv2-serial.yaml resources: + limits: + cpu: 4 + memory: 6Gi requests: - memory: "6Gi" + cpu: 4 + memory: 6Gi - name: pull-kubernetes-node-crio-e2e + cluster: k8s-infra-prow-build skip_branches: - release-\d+\.\d+ # per-release image annotations: @@ -1175,7 +1217,6 @@ presubmits: - -- # end bootstrap args, scenario args below - --deployment=node - --env=KUBE_SSH_USER=core - - --gcp-project=k8s-jkns-pr-node-e2e - --gcp-zone=us-west1-b - '--node-test-args=--container-runtime=remote --container-runtime-endpoint=unix:///var/run/crio/crio.sock --container-runtime-process-name=/usr/local/bin/crio --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/crio.service --kubelet-cgroups=/system.slice/kubelet.service --non-masquerade-cidr=0.0.0.0/0" --extra-log="{\"name\": \"crio.log\", \"journalctl\": [\"-u\", \"crio\"]}"' - --node-tests=true @@ -1184,8 +1225,12 @@ presubmits: - --timeout=180m - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/crio/latest/image-config-cgrpv1.yaml resources: + limits: + cpu: 4 + memory: 6Gi requests: - memory: "6Gi" + cpu: 4 + memory: 6Gi - name: pull-kubernetes-node-crio-e2e-kubetest2 # explicitly needs /test pull-kubernetes-node-crio-e2e-kubetest2 to run always_run: false @@ -1238,6 +1283,7 @@ presubmits: - --image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/latest/image-config-cgrpv1.yaml - name: pull-kubernetes-node-kubelet-serial-memory-manager + cluster: k8s-infra-prow-build always_run: false optional: true skip_report: false @@ -1253,6 +1299,13 @@ presubmits: spec: containers: - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211108-d0d3c6d7a8-master + resources: + limits: + cpu: 4 + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi args: - --repo=k8s.io/kubernetes=$(PULL_REFS) - --repo=k8s.io/release @@ -1261,7 +1314,6 @@ presubmits: - --scenario=kubernetes_e2e - -- - --deployment=node - - --gcp-project=k8s-jkns-pr-node-e2e - --gcp-zone=us-west1-b - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/image-config-serial-cpu-manager.yaml - --node-test-args=--kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" @@ -1274,6 +1326,7 @@ presubmits: value: /go - name: pull-kubernetes-node-memoryqos-cgrpv2 + cluster: k8s-infra-prow-build skip_branches: - release-\d+\.\d+ # per-release image annotations: @@ -1301,7 +1354,6 @@ presubmits: - -- # end bootstrap args, scenario args below - --deployment=node - --env=KUBE_SSH_USER=core - - --gcp-project=k8s-jkns-pr-node-e2e - --gcp-zone=us-west1-b - '--node-test-args=--feature-gates=MemoryQoS=true --container-runtime=remote --container-runtime-endpoint=unix:///var/run/crio/crio.sock --container-runtime-process-name=/usr/local/bin/crio --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/crio.service --kubelet-cgroups=/system.slice/kubelet.service --non-masquerade-cidr=0.0.0.0/0" --extra-log="{\"name\": \"crio.log\", \"journalctl\": [\"-u\", \"crio\"]}"' - --node-tests=true @@ -1310,9 +1362,14 @@ presubmits: - --timeout=180m - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/crio/latest/image-config-cgrpv2.yaml resources: + limits: + cpu: 4 + memory: 6Gi requests: - memory: "6Gi" + cpu: 4 + memory: 6Gi - name: pull-kubernetes-node-swap-ubuntu + cluster: k8s-infra-prow-build always_run: false optional: true skip_report: false @@ -1337,7 +1394,6 @@ presubmits: - --scenario=kubernetes_e2e - -- - --deployment=node - - --gcp-project=k8s-jkns-pr-node-e2e - --gcp-zone=us-west1-b - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/swap/image-config-swap.yaml - --node-test-args=--feature-gates=NodeSwap=true --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/ --fail-swap-on=false" @@ -1349,10 +1405,15 @@ presubmits: - name: GOPATH value: /go resources: + limits: + cpu: 4 + memory: 6Gi requests: - memory: "6Gi" + cpu: 4 + memory: 6Gi - name: pull-kubernetes-node-swap-fedora + cluster: k8s-infra-prow-build skip_branches: - release-\d+\.\d+ # per-release image annotations: @@ -1381,7 +1442,6 @@ presubmits: - -- # end bootstrap args, scenario args below - --deployment=node - --env=KUBE_SSH_USER=core - - --gcp-project=k8s-jkns-pr-node-e2e - --gcp-zone=us-west1-b - '--node-test-args=--feature-gates=NodeSwap=true --container-runtime=remote --container-runtime-endpoint=unix:///var/run/crio/crio.sock --container-runtime-process-name=/usr/local/bin/crio --container-runtime-pid-file= --kubelet-flags="--fail-swap-on=false --cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/crio.service --kubelet-cgroups=/system.slice/kubelet.service --non-masquerade-cidr=0.0.0.0/0" --extra-log="{\"name\": \"crio.log\", \"journalctl\": [\"-u\", \"crio\"]}"' - --node-tests=true @@ -1390,5 +1450,9 @@ presubmits: - --timeout=180m - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/swap/image-config-swap-fedora.yaml resources: + limits: + cpu: 4 + memory: 6Gi requests: - memory: "6Gi" + cpu: 4 + memory: 6Gi