diff --git a/config/jobs/kubernetes/sig-node/containerd.yaml b/config/jobs/kubernetes/sig-node/containerd.yaml index 7faefd348348..75d725490549 100644 --- a/config/jobs/kubernetes/sig-node/containerd.yaml +++ b/config/jobs/kubernetes/sig-node/containerd.yaml @@ -216,6 +216,7 @@ periodics: testgrid-tab-name: containerd-node-conformance testgrid-alert-email: kubernetes-sig-node-test-failures@googlegroups.com - name: ci-containerd-node-e2e-1-4 + cluster: k8s-infra-prow-build interval: 1h labels: preset-service-account: "true" @@ -232,7 +233,6 @@ periodics: - -- - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/containerd/containerd-release-1.4/image-config.yaml - --deployment=node - - --gcp-project=cri-containerd-node-e2e - --gcp-zone=us-central1-b - '--node-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\"]}"' - --node-tests=true @@ -242,10 +242,18 @@ periodics: env: - name: GOPATH value: /go + resources: + limits: + cpu: 4 + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi annotations: testgrid-dashboards: sig-node-containerd testgrid-tab-name: containerd-node-e2e-1.4 - name: ci-containerd-node-e2e-features + cluster: k8s-infra-prow-build interval: 1h labels: preset-service-account: "true" @@ -262,7 +270,6 @@ periodics: - -- - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/containerd/containerd-master/image-config.yaml - --deployment=node - - --gcp-project=cri-containerd-node-e2e - --gcp-zone=us-central1-b - '--node-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\"]}"' - --node-tests=true @@ -274,10 +281,18 @@ periodics: env: - name: GOPATH value: /go + resources: + limits: + cpu: 4 + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi annotations: testgrid-dashboards: sig-node-containerd testgrid-tab-name: containerd-node-features - name: ci-containerd-node-e2e-1-5 + cluster: k8s-infra-prow-build interval: 1h labels: preset-service-account: "true" @@ -294,7 +309,6 @@ periodics: - -- - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/containerd/containerd-release-1.5/image-config.yaml - --deployment=node - - --gcp-project=cri-containerd-node-e2e - --gcp-zone=us-central1-b - '--node-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\"]}"' - --node-tests=true @@ -304,10 +318,18 @@ periodics: env: - name: GOPATH value: /go + resources: + limits: + cpu: 4 + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi annotations: testgrid-dashboards: sig-node-containerd testgrid-tab-name: containerd-node-e2e-1.5 - name: ci-containerd-node-e2e-features-1-4 + cluster: k8s-infra-prow-build interval: 1h labels: preset-service-account: "true" @@ -324,7 +346,6 @@ periodics: - -- - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/containerd/containerd-release-1.4/image-config.yaml - --deployment=node - - --gcp-project=cri-containerd-node-e2e - --gcp-zone=us-central1-b - '--node-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\"]}"' - --node-tests=true @@ -334,10 +355,18 @@ periodics: env: - name: GOPATH value: /go + resources: + limits: + cpu: 4 + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi annotations: testgrid-dashboards: sig-node-containerd testgrid-tab-name: containerd-node-e2e-features-1.4 - name: ci-containerd-node-e2e-features-1-5 + cluster: k8s-infra-prow-build interval: 1h labels: preset-service-account: "true" @@ -354,7 +383,6 @@ periodics: - -- - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/containerd/containerd-release-1.5/image-config.yaml - --deployment=node - - --gcp-project=cri-containerd-node-e2e - --gcp-zone=us-central1-b - '--node-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\"]}"' - --node-tests=true @@ -364,6 +392,13 @@ periodics: env: - name: GOPATH value: /go + resources: + limits: + cpu: 4 + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi annotations: testgrid-dashboards: sig-node-containerd testgrid-tab-name: containerd-node-e2e-features-1.5 @@ -697,6 +732,7 @@ periodics: testgrid-dashboards: sig-node-containerd testgrid-tab-name: e2e-ubuntu - name: ci-cri-containerd-node-e2e + cluster: k8s-infra-prow-build interval: 1h labels: preset-service-account: "true" @@ -713,7 +749,6 @@ periodics: - -- - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/containerd/containerd-master/image-config.yaml - --deployment=node - - --gcp-project=cri-containerd-node-e2e - --gcp-zone=us-central1-b - '--node-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\"]}"' - --node-tests=true @@ -723,10 +758,18 @@ periodics: env: - name: GOPATH value: /go + resources: + limits: + cpu: 4 + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi annotations: testgrid-dashboards: sig-node-containerd testgrid-tab-name: node-e2e - name: ci-cri-containerd-node-e2e-benchmark + cluster: k8s-infra-prow-build interval: 2h labels: preset-service-account: "true" @@ -743,7 +786,6 @@ periodics: - -- - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/containerd/cri-master/benchmark-config.yaml - --deployment=node - - --gcp-project=cri-containerd-node-e2e - --gcp-zone=us-central1-b - '--node-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\"]}"' - --node-tests=true @@ -753,10 +795,18 @@ periodics: env: - name: GOPATH value: /go + resources: + limits: + cpu: 4 + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi annotations: testgrid-dashboards: sig-node-containerd testgrid-tab-name: node-e2e-benchmark - name: ci-cri-containerd-node-e2e-features + cluster: k8s-infra-prow-build interval: 1h labels: preset-service-account: "true" @@ -773,7 +823,6 @@ periodics: - -- - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/containerd/containerd-master/image-config.yaml - --deployment=node - - --gcp-project=cri-containerd-node-e2e - --gcp-zone=us-west1-b - '--node-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\"]}"' - --node-tests=true @@ -783,6 +832,13 @@ periodics: env: - name: GOPATH value: /go + resources: + limits: + cpu: 4 + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi annotations: testgrid-dashboards: sig-node-containerd testgrid-tab-name: node-e2e-features @@ -842,6 +898,7 @@ periodics: testgrid-dashboards: sig-node-containerd testgrid-tab-name: image-validation-ubuntu-e2e - name: ci-cos-containerd-node-e2e + cluster: k8s-infra-prow-build interval: 1h labels: preset-service-account: "true" @@ -857,7 +914,6 @@ periodics: - -- - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/containerd/image-config.yaml - --deployment=node - - --gcp-project=cri-containerd-node-e2e - --gcp-zone=us-west1-b - '--node-test-args=--container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/usr/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\"]}"' - --node-tests=true @@ -867,10 +923,18 @@ periodics: env: - name: GOPATH value: /go + resources: + limits: + cpu: 4 + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi annotations: testgrid-dashboards: sig-node-containerd testgrid-tab-name: image-validation-node-e2e - name: ci-cos-containerd-node-e2e-features + cluster: k8s-infra-prow-build interval: 1h labels: preset-service-account: "true" @@ -886,7 +950,6 @@ periodics: - -- - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/containerd/image-config.yaml - --deployment=node - - --gcp-project=cri-containerd-node-e2e - --gcp-zone=us-west1-b - '--node-test-args=--container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/usr/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\"]}"' - --node-tests=true @@ -896,10 +959,18 @@ periodics: env: - name: GOPATH value: /go + resources: + limits: + cpu: 4 + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi annotations: testgrid-dashboards: sig-node-containerd testgrid-tab-name: image-validation-node-features - name: ci-cos-cgroupv2-containerd-node-e2e + cluster: k8s-infra-prow-build interval: 12h labels: preset-service-account: "true" @@ -916,7 +987,6 @@ periodics: - -- - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/containerd/containerd-master/cgroupv2/image-config-cgroupv2.yaml - --deployment=node - - --gcp-project=cri-containerd-node-e2e - --gcp-zone=us-west1-b - '--node-test-args=--container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/usr/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd\"]}"' - --node-tests=true @@ -926,6 +996,13 @@ periodics: env: - name: GOPATH value: /go + resources: + limits: + cpu: 4 + memory: 6Gi + requests: + cpu: 4 + memory: 6Gi annotations: testgrid-dashboards: sig-node-containerd testgrid-tab-name: cos-cgroupv2-containerd-node-e2e @@ -995,6 +1072,7 @@ periodics: testgrid-dashboards: sig-node-containerd testgrid-tab-name: cos-cgroupv2-containerd-e2e - name: ci-cos-cgroupv2-containerd-node-e2e-serial + cluster: k8s-infra-prow-build interval: 12h labels: preset-service-account: "true" @@ -1011,7 +1089,6 @@ periodics: - -- - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/containerd/containerd-master/cgroupv2/image-config-cgroupv2-serial.yaml - --deployment=node - - --gcp-project=cri-containerd-node-e2e - --gcp-zone=us-west1-b - '--node-test-args=--feature-gates=LocalStorageCapacityIsolation=true --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/usr/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd*\"]}"' - --node-tests=true diff --git a/config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml b/config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml index 74e61515faef..1488404ccaa4 100644 --- a/config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml +++ b/config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml @@ -269,6 +269,7 @@ presubmits: - '--test-args=--container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/usr/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/image-config.yaml - name: pull-kubernetes-node-e2e-containerd-features + cluster: k8s-infra-prow-build branches: - master always_run: false @@ -294,7 +295,6 @@ presubmits: - -- - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/containerd/containerd-master/image-config.yaml - --deployment=node - - --gcp-project=cri-containerd-node-e2e - --gcp-zone=us-central1-b - '--node-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\"]}"' - --node-tests=true @@ -312,6 +312,7 @@ presubmits: cpu: 4 memory: 6Gi - name: pull-kubernetes-node-e2e-containerd-features-kubetest2 + cluster: k8s-infra-prow-build # explicitly needs /test pull-kubernetes-node-e2e-containerd-features-kubetest2 to run always_run: false # if at all it is run and fails, don't block the PR @@ -359,7 +360,6 @@ presubmits: - --test=node - -- - --repo-root=. - - --gcp-project=cri-containerd-node-e2e - --gcp-zone=us-central1-b - --parallelism=8 - --focus-regex=\[NodeFeature:.+\] @@ -367,6 +367,13 @@ 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=/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-master/image-config.yaml - --image-config-dir=/home/prow + resources: + requests: + cpu: 4 + memory: 6Gi + limits: + cpu: 4 + memory: 6Gi - name: pull-kubernetes-node-e2e-alpha cluster: k8s-infra-prow-build branches: