From 79ab87300385742ff8ad28ff838dd263cacbe29a 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 | 102 ++++++++++++++---- 2 files changed, 82 insertions(+), 21 deletions(-) diff --git a/config/jobs/kubernetes/sig-node/node-kubelet.yaml b/config/jobs/kubernetes/sig-node/node-kubelet.yaml index 3e69f5aedf747..baa651ed7f217 100644 --- a/config/jobs/kubernetes/sig-node/node-kubelet.yaml +++ b/config/jobs/kubernetes/sig-node/node-kubelet.yaml @@ -209,6 +209,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 19de6b779ab3c..b0a8c8788af28 100644 --- a/config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml +++ b/config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml @@ -362,6 +362,7 @@ presubmits: - '--test-args=--container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/home/containerd/usr/local/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd\"]}"' - --image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-master/image-config.yaml - name: pull-kubernetes-node-e2e-alpha + cluster: k8s-infra-prow-build branches: - master always_run: false @@ -382,7 +383,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 @@ -391,11 +391,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 @@ -422,8 +427,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:v20211014-7ca1952a94-experimental resources: + limits: + cpu: 4 + memory: 6Gi requests: - memory: "6Gi" + cpu: 4 + memory: 6Gi command: - runner.sh args: @@ -432,7 +441,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\]' @@ -779,6 +787,7 @@ presubmits: - --test-args='--feature-gates=DynamicKubeletConfig=true,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 @@ -793,6 +802,13 @@ presubmits: spec: containers: - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211014-7ca1952a94-master + resources: + limits: + cpu: 4 + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi args: - --repo=k8s.io/kubernetes=$(PULL_REFS) - --repo=k8s.io/release @@ -801,7 +817,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=--feature-gates=DynamicKubeletConfig=true --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" @@ -813,6 +828,7 @@ presubmits: - name: GOPATH value: /go - name: pull-kubernetes-node-kubelet-serial-topology-manager + cluster: k8s-infra-prow-build always_run: false optional: true skip_report: false @@ -827,6 +843,13 @@ presubmits: spec: containers: - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211014-7ca1952a94-master + resources: + limits: + cpu: 4 + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi args: - --repo=k8s.io/kubernetes=$(PULL_REFS) - --repo=k8s.io/release @@ -835,7 +858,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=--feature-gates=DynamicKubeletConfig=true --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" @@ -847,6 +869,7 @@ presubmits: - name: GOPATH value: /go - name: pull-kubernetes-node-kubelet-serial-hugepages + cluster: k8s-infra-prow-build always_run: false optional: true skip_report: false @@ -861,6 +884,13 @@ presubmits: spec: containers: - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211014-7ca1952a94-master + resources: + limits: + cpu: 4 + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi args: - --repo=k8s.io/kubernetes=$(PULL_REFS) - --repo=k8s.io/release @@ -869,7 +899,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=/" @@ -881,6 +910,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: @@ -908,7 +938,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 @@ -917,9 +946,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-kubelet-serial-crio-cgroupv1 + cluster: k8s-infra-prow-build skip_branches: - release-\d+\.\d+ # per-release image annotations: @@ -946,7 +980,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 @@ -955,9 +988,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: @@ -984,7 +1022,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 @@ -996,6 +1033,7 @@ presubmits: requests: memory: "6Gi" - name: pull-kubernetes-node-crio-e2e + cluster: k8s-infra-prow-build skip_branches: - release-\d+\.\d+ # per-release image annotations: @@ -1024,7 +1062,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 @@ -1033,10 +1070,15 @@ 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-kubelet-serial-memory-manager + cluster: k8s-infra-prow-build always_run: false optional: true skip_report: false @@ -1052,6 +1094,13 @@ presubmits: spec: containers: - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20211014-7ca1952a94-master + resources: + limits: + cpu: 4 + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi args: - --repo=k8s.io/kubernetes=$(PULL_REFS) - --repo=k8s.io/release @@ -1060,7 +1109,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=/" @@ -1073,6 +1121,7 @@ presubmits: value: /go - name: pull-kubernetes-node-memoryqos-cgrpv2 + cluster: k8s-infra-prow-build skip_branches: - release-\d+\.\d+ # per-release image annotations: @@ -1100,7 +1149,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 @@ -1109,9 +1157,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 @@ -1136,7 +1189,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" @@ -1148,10 +1200,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: @@ -1180,7 +1237,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 @@ -1189,5 +1245,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