Merge pull request kubernetes#22436 from harche/revert_crio_blocking

Revert making pull-kubernetes-node-crio-e2e blocking
jingxu97 · Jun 5, 2021 · bd700c4 · bd700c4
2 parents 3a5178f + e60b369
commit bd700c4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml b/config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml
@@ -461,8 +461,8 @@ presubmits:
       testgrid-dashboards: sig-node-cri-o
       testgrid-tab-name: pr-crio-gce-e2e
     always_run: true
-    optional: false
-    cluster: k8s-infra-prow-build
+    skip_report: true
+    optional: true
     max_concurrency: 12
     labels:
       preset-service-account: "true"
@@ -483,6 +483,7 @@ 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
@@ -491,12 +492,8 @@ 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:
-            cpu: 4
-            memory: 6Gi
+            memory: "6Gi"
 
   - name: pull-kubernetes-node-kubelet-serial-memory-manager
     always_run: false

diff --git a/config/testgrids/kubernetes/presubmits/config.yaml b/config/testgrids/kubernetes/presubmits/config.yaml
@@ -59,9 +59,6 @@ dashboards:
   - name: pull-kubernetes-node-e2e-containerd
     test_group_name: pull-kubernetes-node-e2e-containerd
     base_options: width=10
-  - name: pull-kubernetes-node-crio-e2e
-    test_group_name: pull-kubernetes-node-crio-e2e
-    base_options: width=10
   - name: pull-kubernetes-integration
     test_group_name: pull-kubernetes-integration
     base_options: width=10